1
0
mirror of https://github.com/php/php-src.git synced 2026-03-29 11:42:17 +02:00
Commit Graph

98873 Commits

Author SHA1 Message Date
Anatol Belski
8486e045db Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix erroneous line in confutils.js
2016-11-12 02:38:33 +01:00
Stricted
81fed37784 fix erroneous line in confutils.js 2016-11-12 02:35:41 +01:00
Nikita Popov
3c8beb16c4 Allow early-binding of ZEND_NEW args 2016-11-10 22:52:15 +01:00
Nikita Popov
8106c01afc Fix block pass leaks 2016-11-10 22:28:32 +01:00
Nikita Popov
62af7e0db8 Merge branch 'PHP-7.0' into PHP-7.1 2016-11-10 22:19:48 +01:00
Nikita Popov
bb3d0c0e17 Fcall optimization: Avoid FETCH_DIM_R with UNUSED op2 2016-11-10 21:36:46 +01:00
Joe Watkins
56e1807ef9 belated news entries 2016-11-10 17:11:24 +00:00
Nikita Popov
3048428cf0 Don't elide undef var notice 2016-11-10 14:58:54 +01:00
Nikita Popov
4f76073b6d Set result of FREE to unused in block pass 2016-11-10 14:55:52 +01:00
Nikita Popov
570e7fa331 Fix ext/xml func info 2016-11-10 14:55:50 +01:00
Nikita Popov
0378121c64 Range inference cleanup
Replace inline #ifdefs with some macros. Fix build if NEG_RANGE is
disabled. Fix some typos. Add some comments.
2016-11-10 14:55:40 +01:00
Dmitry Stogov
0950550fb9 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Don't update proprties inplace.
2016-11-10 12:34:09 +03:00
Dmitry Stogov
15ac490472 Don't update proprties inplace. 2016-11-10 12:32:07 +03:00
Anatol Belski
4a242b9feb Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  add missing NEWS entry
  add missing NEWS entry
2016-11-09 21:37:41 +01:00
Anatol Belski
6c087f8551 add missing entry 2016-11-09 21:37:04 +01:00
Anatol Belski
f6be108574 add missing NEWS entry 2016-11-09 21:34:41 +01:00
Anatol Belski
cc1337bced Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  add missing NEWS entry
2016-11-09 21:34:16 +01:00
Anatol Belski
e922d89f66 add missing NEWS entry 2016-11-09 21:32:44 +01:00
Anatol Belski
ddbac6d70d improve lib name guessing for newer libtidy
FreeBSD calls it tidy5. Still, the check is not perfect, as both
old and new lib can coexist. ATM, the preference is to pick up the
old lib, still. In it's absense the new one will be looked up.
2016-11-09 11:28:50 +01:00
Anatol Belski
5445685591 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  sync NEWS
2016-11-09 11:20:20 +01:00
Anatol Belski
1beb5a74b1 sync NEWS 2016-11-09 11:19:13 +01:00
Pedro Magalhães
9b41591883 Remove binary casts from PHAR's default stub 2016-11-09 03:23:15 +00:00
Ferenc Kovacs
6cd7423706 Merge branch 'PHP-7.0' into PHP-7.1 2016-11-09 02:18:18 +01:00
Ferenc Kovacs
723c7c6466 Merge branch 'PHP-5.6' into PHP-7.0 2016-11-09 02:16:32 +01:00
Ferenc Kovacs
87673d6e99 add missing NEWS entries 2016-11-09 02:12:16 +01:00
Anatol Belski
59f2f14aea Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix memory leak
2016-11-08 12:17:39 +01:00
Anatol Belski
e87daf363b Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  fix memory leak
2016-11-08 12:16:39 +01:00
Anatol Belski
d6d08f97cd fix memory leak 2016-11-08 12:12:58 +01:00
Anatol Belski
9b81342352 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed bug #73418 Integer Overflow in "_php_imap_mail" leads to crash
  Fixed bug #73418 Integer Overflow in "_php_imap_mail" leads to crash
  Fix #72696: imagefilltoborder stackoverflow on truecolor images
  Fix #72482: Ilegal write/read access caused by gdImageAALine overflow
  Fix bug #73144 and bug #73341 - remove extra dtor
  remove unreferenced var came in with merge
  Fix bug #73331 - do not try to serialize/unserialize objects wddx can not handle
  Fix #72696: imagefilltoborder stackoverflow on truecolor images
  Fix #72482: Ilegal write/read access caused by gdImageAALine overflow
  fix version
  set versions
  Fix bug #73144 and bug #73341 - remove extra dtor
  Fix bug #73331 - do not try to serialize/unserialize objects wddx can not handle
2016-11-08 11:15:06 +01:00
Anatol Belski
2b30b54275 Merge remote-tracking branch 'phpsec/PHP-7.0.13' into PHP-7.0
* phpsec/PHP-7.0.13:
  Fixed bug #73418 Integer Overflow in "_php_imap_mail" leads to crash
  Fix #72696: imagefilltoborder stackoverflow on truecolor images
  Fix #72482: Ilegal write/read access caused by gdImageAALine overflow
  Fix bug #73144 and bug #73341 - remove extra dtor
  remove unreferenced var came in with merge
  Fix bug #73331 - do not try to serialize/unserialize objects wddx can not handle
  fix version
  set versions
2016-11-08 11:13:29 +01:00
Anatol Belski
5faaf76bd5 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fixed bug #73418 Integer Overflow in "_php_imap_mail" leads to crash
  Fix #72696: imagefilltoborder stackoverflow on truecolor images
  Fix #72482: Ilegal write/read access caused by gdImageAALine overflow
  Fix bug #73144 and bug #73341 - remove extra dtor
  Fix bug #73331 - do not try to serialize/unserialize objects wddx can not handle
2016-11-08 11:11:22 +01:00
Anatol Belski
33766347cb Merge remote-tracking branch 'phpsec/PHP-5.6.28' into PHP-5.6 2016-11-08 11:06:52 +01:00
Anatol Belski
ed12167edf Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Enable FTS4 and FTS5 for bundled libsqlite
2016-11-08 02:35:33 +01:00
Anatol Belski
ef55a4b5b3 Enable FTS4 and FTS5 for bundled libsqlite
FTS3 is already enabled by default, and the other FTS versions
seems just to have been missed. Given that, the other FTS plugins
look like a low impact so worth a try. The current bundled libsqlite
versions in 7.x are proven stable already and support FTS5.
2016-11-08 02:26:43 +01:00
Anatol Belski
271a593198 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  avoid unneeded copying
2016-11-07 21:19:04 +01:00
Anatol Belski
0c2156d190 avoid unneeded copying 2016-11-07 21:09:03 +01:00
Anatol Belski
a6aa3edd73 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  update NEWS
2016-11-07 20:48:41 +01:00
Anatol Belski
054eafdc63 update NEWS 2016-11-07 20:48:13 +01:00
Anatol Belski
a67b894cc8 update NEWS 2016-11-07 20:47:06 +01:00
Anatol Belski
1257287dbd Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Add test for bug #73448
2016-11-07 20:40:46 +01:00
Anatol Belski
f0676cbe20 Add test for bug #73448 2016-11-07 20:39:51 +01:00
Anatol Belski
42925630a4 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed bug #73448 odbc_errormsg returns trash, always 513 bytes
2016-11-07 20:21:56 +01:00
Anatol Belski
3558e70e58 Fixed bug #73448 odbc_errormsg returns trash, always 513 bytes 2016-11-07 20:18:29 +01:00
Derick Rethans
69a3659d41 Add hint that naive DateTime comparisions now are more likely to fail 2016-11-07 16:40:42 +00:00
Jakub Zelenka
e161b0f755 Merge branch 'PHP-7.0' into PHP-7.1 2016-11-06 20:44:40 +00:00
Jakub Zelenka
20587805f9 Merge branch 'PHP-5.6' into PHP-7.0 2016-11-06 20:43:50 +00:00
Jakub Zelenka
493b2bff02 Fix bug #72776 (Invalid parameter in memcpy function trough openssl_pbkdf2) 2016-11-06 20:40:51 +00:00
Jakub Zelenka
e840071b76 Never return private part of the key from openssl_csr_get_public_key
This fixes ecc.phpt test when OpenSSL 1.1 linked.
2016-11-06 17:37:06 +00:00
Anatol Belski
43df063f9f Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  add missing RETURN_STRINGL_CHECK
2016-11-06 17:57:19 +01:00
Anatol Belski
8d1376ee4f Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  add missing RETURN_STRINGL_CHECK
2016-11-06 17:56:14 +01:00