]>
granicus.if.org Git - php/log
Nikita Popov [Fri, 29 Apr 2016 20:39:21 +0000 (22:39 +0200)]
Reset IMMUTABLE flag when copy_ctor'ing AST
Nikita Popov [Fri, 29 Apr 2016 20:15:38 +0000 (22:15 +0200)]
Drop dead code from update_constant
Nikita Popov [Fri, 29 Apr 2016 20:00:54 +0000 (22:00 +0200)]
Revert code to use DUP instead of COPY
In
a1c405e0c50c627cdd9a7695b4c7d644238b6b9b next to the actual fix
I have also switched some (effective) ZVAL_DUPs to ZVAL_COPYs. I'm
reverting this part as those were probably there for a reason
(presumably issues with non-atomic refcounting on ZTS).
Anatol Belski [Fri, 29 Apr 2016 12:31:49 +0000 (14:31 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix test
Expose some of the new curl constants to PHP userspace
Anatol Belski [Fri, 29 Apr 2016 12:30:19 +0000 (14:30 +0200)]
fix test
Pierrick Charron [Wed, 27 Apr 2016 22:43:41 +0000 (18:43 -0400)]
Expose some of the new curl constants to PHP userspace
Nikita Popov [Fri, 29 Apr 2016 12:04:23 +0000 (14:04 +0200)]
Fix usages of zend_update_constant_ex
If an in-place update in an external zval is performed, it needs
to incref'd beforehand, not afterwards.
Joe Watkins [Fri, 29 Apr 2016 12:05:44 +0000 (13:05 +0100)]
Merge branch 'master' of https://github.com/php/php-src
Joe Watkins [Fri, 29 Apr 2016 12:05:29 +0000 (13:05 +0100)]
news entry
Dmitry Stogov [Fri, 29 Apr 2016 11:45:29 +0000 (14:45 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Implement #51879 stream context socket option tcp_nodelay
Dmitry Stogov [Fri, 29 Apr 2016 11:44:56 +0000 (14:44 +0300)]
Fixed compilation warnings
Joe Watkins [Fri, 29 Apr 2016 11:26:18 +0000 (12:26 +0100)]
Merge branch 'master' of https://github.com/php/php-src
Joe Watkins [Fri, 29 Apr 2016 11:25:54 +0000 (12:25 +0100)]
Implement #51879 stream context socket option tcp_nodelay
Joe Watkins [Wed, 27 Apr 2016 21:56:15 +0000 (22:56 +0100)]
Implement #51879 stream context socket option tcp_nodelay
Dmitry Stogov [Fri, 29 Apr 2016 11:03:33 +0000 (14:03 +0300)]
Fixed compilation warnings
Dmitry Stogov [Fri, 29 Apr 2016 10:44:23 +0000 (13:44 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Add CVE IDs PHP 7.0.0
Add CVE IDs PHP 7.0.2
Add CVE IDs PHP 7.0.3
Add CVE IDs PHP 7.0.4
Add CVE IDs PHP 7.0.5
Add CVE to bug #71912 (PHP 7.0.6)
Add CVE to bug #69719 (PHP 5.6.10)
Add CVE IDs PHP 5.6.12
Add CVE IDs PHP 5.6.13
Add CVE IDs PHP 5.6.14
Add CVE to bug #70976 (PHP 5.6.17)
Add CVE IDs PHP 5.6.18
Add CVE IDs PHP 5.6.20
Add CVE to bug #71912 (PHP 5.6.21)
Dmitry Stogov [Fri, 29 Apr 2016 10:43:43 +0000 (13:43 +0300)]
Fixed "comparison between signed and unsigned integer expressions" compilation warnings
Lior Kaplan [Fri, 29 Apr 2016 10:42:54 +0000 (13:42 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Add CVE IDs PHP 7.0.0
Add CVE IDs PHP 7.0.2
Add CVE IDs PHP 7.0.3
Add CVE IDs PHP 7.0.4
Add CVE IDs PHP 7.0.5
Add CVE to bug #71912 (PHP 7.0.6)
Add CVE to bug #69719 (PHP 5.6.10)
Add CVE IDs PHP 5.6.12
Add CVE IDs PHP 5.6.13
Add CVE IDs PHP 5.6.14
Add CVE to bug #70976 (PHP 5.6.17)
Add CVE IDs PHP 5.6.18
Add CVE IDs PHP 5.6.20
Add CVE to bug #71912 (PHP 5.6.21)
Lior Kaplan [Fri, 29 Apr 2016 10:41:29 +0000 (13:41 +0300)]
Add CVE IDs PHP 7.0.0
Lior Kaplan [Fri, 29 Apr 2016 10:40:44 +0000 (13:40 +0300)]
Add CVE IDs PHP 7.0.2
Lior Kaplan [Fri, 29 Apr 2016 10:40:07 +0000 (13:40 +0300)]
Add CVE IDs PHP 7.0.3
Lior Kaplan [Fri, 29 Apr 2016 10:39:03 +0000 (13:39 +0300)]
Add CVE IDs PHP 7.0.4
Lior Kaplan [Fri, 29 Apr 2016 10:38:25 +0000 (13:38 +0300)]
Add CVE IDs PHP 7.0.5
Lior Kaplan [Fri, 29 Apr 2016 10:36:24 +0000 (13:36 +0300)]
Add CVE to bug #71912 (PHP 7.0.6)
Lior Kaplan [Fri, 29 Apr 2016 10:26:46 +0000 (13:26 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Add CVE to bug #69719 (PHP 5.6.10)
Add CVE IDs PHP 5.6.12
Add CVE IDs PHP 5.6.13
Add CVE IDs PHP 5.6.14
Add CVE to bug #70976 (PHP 5.6.17)
Add CVE IDs PHP 5.6.18
Add CVE IDs PHP 5.6.20
Add CVE to bug #71912 (PHP 5.6.21)
Lior Kaplan [Fri, 29 Apr 2016 10:23:41 +0000 (13:23 +0300)]
Add CVE to bug #69719 (PHP 5.6.10)
Lior Kaplan [Fri, 29 Apr 2016 10:21:35 +0000 (13:21 +0300)]
Add CVE IDs PHP 5.6.12
Lior Kaplan [Fri, 29 Apr 2016 10:19:46 +0000 (13:19 +0300)]
Add CVE IDs PHP 5.6.13
Lior Kaplan [Fri, 29 Apr 2016 10:17:34 +0000 (13:17 +0300)]
Add CVE IDs PHP 5.6.14
Lior Kaplan [Fri, 29 Apr 2016 10:16:27 +0000 (13:16 +0300)]
Add CVE to bug #70976 (PHP 5.6.17)
Lior Kaplan [Fri, 29 Apr 2016 10:15:30 +0000 (13:15 +0300)]
Add CVE IDs PHP 5.6.18
Dmitry Stogov [Fri, 29 Apr 2016 10:13:59 +0000 (13:13 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
fix constants availability
fix size_t signed comparison
Lior Kaplan [Fri, 29 Apr 2016 10:11:54 +0000 (13:11 +0300)]
Add CVE IDs PHP 5.6.20
Dmitry Stogov [Fri, 29 Apr 2016 10:11:27 +0000 (13:11 +0300)]
Fixed breaks of strict-aliasing rules
Lior Kaplan [Fri, 29 Apr 2016 10:10:13 +0000 (13:10 +0300)]
Add CVE to bug #71912 (PHP 5.6.21)
Dmitry Stogov [Fri, 29 Apr 2016 09:49:54 +0000 (12:49 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed condition
Dmitry Stogov [Fri, 29 Apr 2016 09:49:41 +0000 (12:49 +0300)]
Fixed condition
Dmitry Stogov [Fri, 29 Apr 2016 09:39:27 +0000 (12:39 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Use unsigned shift to clear the bit.
Dmitry Stogov [Fri, 29 Apr 2016 09:38:48 +0000 (12:38 +0300)]
Use unsigned shift to clear the bit.
Anatol Belski [Fri, 29 Apr 2016 09:34:54 +0000 (11:34 +0200)]
fix constants availability
The issue here is that winsock2 defines IP protocols as an enum,
so the preprocessor won't catch it. However all the items related
are available as of winxp (see ws2def.h), so it's safe just to have.
Dmitry Stogov [Fri, 29 Apr 2016 09:34:09 +0000 (12:34 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Simplified condition
Dmitry Stogov [Fri, 29 Apr 2016 09:33:54 +0000 (12:33 +0300)]
Simplified condition
Dmitry Stogov [Fri, 29 Apr 2016 09:24:13 +0000 (12:24 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
size_t is unsigned and can't be negative
Dmitry Stogov [Fri, 29 Apr 2016 09:23:30 +0000 (12:23 +0300)]
size_t is unsigned and can't be negative
Joe Watkins [Fri, 29 Apr 2016 09:20:27 +0000 (10:20 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix size_t signed comparison
Joe Watkins [Fri, 29 Apr 2016 09:19:55 +0000 (10:19 +0100)]
fix size_t signed comparison
Dmitry Stogov [Fri, 29 Apr 2016 08:15:26 +0000 (11:15 +0300)]
Revert "Fix bad merge into master"
This reverts commit
2c8e4ba8f1f63429f5d0e08a4a0fc6d449ca801a .
Xinchen Hui [Fri, 29 Apr 2016 03:13:29 +0000 (11:13 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed build
Add NEWS entry for bug #71331 (fixed in 7.0.3)
Add NEWS entry for bug #71331 (fixed in PHP 5.6.18)
Xinchen Hui [Fri, 29 Apr 2016 03:13:15 +0000 (11:13 +0800)]
Fixed build
Lior Kaplan [Thu, 28 Apr 2016 18:12:27 +0000 (21:12 +0300)]
Add NEWS entry for bug #71331 (fixed in 7.0.3)
Lior Kaplan [Thu, 28 Apr 2016 18:12:00 +0000 (21:12 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Add NEWS entry for bug #71331 (fixed in PHP 5.6.18)
Nikita Popov [Thu, 28 Apr 2016 18:08:48 +0000 (20:08 +0200)]
Fix GC tests on dbg-zts-nocache
We may collect a different number of zvals depending on interning.
Switch tests to compare against a minimum number of collections
instead of a fixed value.
Anatol Belski [Thu, 28 Apr 2016 17:47:05 +0000 (19:47 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
Lior Kaplan [Thu, 28 Apr 2016 17:46:29 +0000 (20:46 +0300)]
Add NEWS entry for bug #71331 (fixed in PHP 5.6.18)
Anatol Belski [Thu, 28 Apr 2016 17:46:15 +0000 (19:46 +0200)]
update NEWS
Bob Weinand [Thu, 28 Apr 2016 17:32:14 +0000 (19:32 +0200)]
Fix bad merge into master
This should only have been reverted in 7.0, but not for 7.1. (merge=ours??)
Added appropriate NEWS entry.
Nikita Popov [Thu, 28 Apr 2016 17:19:28 +0000 (19:19 +0200)]
Fix leak in guards patch
Dmitry Stogov [Thu, 28 Apr 2016 17:12:57 +0000 (20:12 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Added test
Dmitry Stogov [Thu, 28 Apr 2016 17:12:42 +0000 (20:12 +0300)]
Added test
Dmitry Stogov [Thu, 28 Apr 2016 16:57:59 +0000 (19:57 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed BC break described by bug #72119. It was introduced after 7.0.5 release by attempt to fix bug #71428.
Dmitry Stogov [Thu, 28 Apr 2016 16:56:10 +0000 (19:56 +0300)]
Fixed BC break described by bug #72119.
It was introduced after 7.0.5 release by attempt to fix bug #71428.
Joe Watkins [Thu, 28 Apr 2016 14:52:45 +0000 (15:52 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
simplify expression
Joe Watkins [Thu, 28 Apr 2016 14:52:30 +0000 (15:52 +0100)]
simplify expression
Joe Watkins [Thu, 28 Apr 2016 14:50:36 +0000 (15:50 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
simplify expression
Joe Watkins [Thu, 28 Apr 2016 14:50:27 +0000 (15:50 +0100)]
simplify expression
Joe Watkins [Thu, 28 Apr 2016 14:41:23 +0000 (15:41 +0100)]
Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0
Joe Watkins [Thu, 28 Apr 2016 14:40:59 +0000 (15:40 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
variable used out of scope
Joe Watkins [Thu, 28 Apr 2016 14:40:28 +0000 (15:40 +0100)]
variable used out of scope
Dmitry Stogov [Thu, 28 Apr 2016 12:17:24 +0000 (15:17 +0300)]
Don't initialize EX(call)->symbol_table on each function call.
Keep it uninitialized, and check ZEND_CALL_HAS_SYMBOL_TABLE flag when necessary.
Bob Weinand [Thu, 28 Apr 2016 09:10:53 +0000 (11:10 +0200)]
Merge branch 'PHP-7.0'
Bob Weinand [Thu, 28 Apr 2016 09:02:47 +0000 (11:02 +0200)]
Fixed bug #72116 (7.0.6 array_fill optimization breaks implementation)
Dmitry Stogov [Thu, 28 Apr 2016 01:13:34 +0000 (04:13 +0300)]
- get rid of EG(scope). zend_get_executed_scope() should be used instead.
- ichanged zval_update_constant_ex(). Use IS_TYPE_IMMUTABLE flag on shared constants and AST, instead of "inline_change" parameter.
Ferenc Kovacs [Thu, 28 Apr 2016 00:37:37 +0000 (02:37 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
small whitespace fix
Ferenc Kovacs [Thu, 28 Apr 2016 00:37:01 +0000 (02:37 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
small whitespace fix
Ferenc Kovacs [Thu, 28 Apr 2016 00:32:45 +0000 (02:32 +0200)]
small whitespace fix
Anatol Belski [Wed, 27 Apr 2016 16:59:43 +0000 (18:59 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
Anatol Belski [Wed, 27 Apr 2016 16:58:28 +0000 (18:58 +0200)]
update NEWS
Nikita Popov [Wed, 27 Apr 2016 15:04:25 +0000 (17:04 +0200)]
Support known static/method calls in call graph
For this purpose extract the function lookup call into a helper
zend_optimizer_get_called_func().
Nikita Popov [Thu, 7 Apr 2016 23:41:48 +0000 (01:41 +0200)]
Ct bind private/final $this method call args
The test covers two edge-cases wrt opcache support.
Anatol Belski [Wed, 27 Apr 2016 12:57:14 +0000 (14:57 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
update NEWS
Anatol Belski [Wed, 27 Apr 2016 12:56:35 +0000 (14:56 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update NEWS
Anatol Belski [Wed, 27 Apr 2016 12:56:08 +0000 (14:56 +0200)]
update NEWS
Anatol Belski [Wed, 27 Apr 2016 12:50:46 +0000 (14:50 +0200)]
update NEWS
Xinchen Hui [Wed, 27 Apr 2016 12:34:29 +0000 (20:34 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Use zend_string_safe_alloc
Xinchen Hui [Wed, 27 Apr 2016 12:29:11 +0000 (20:29 +0800)]
Use zend_string_safe_alloc
Anatol Belski [Wed, 27 Apr 2016 11:20:08 +0000 (13:20 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix/improve tests
Anatol Belski [Wed, 27 Apr 2016 11:19:29 +0000 (13:19 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix/improve tests
Anatol Belski [Wed, 27 Apr 2016 11:16:57 +0000 (13:16 +0200)]
fix/improve tests
Dmitry Stogov [Wed, 27 Apr 2016 10:46:38 +0000 (13:46 +0300)]
Removed "zend_fcall_info.function_table". It was assigned in many places, but is never used.
Anatol Belski [Wed, 27 Apr 2016 10:30:34 +0000 (12:30 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix merge
Fix memory leak
Fix bug #72099: xml_parse_into_struct segmentation fault
5.5.36 now
Fix bug #72094 - Out of bounds heap read access in exif header processing
Fix bug #72093: bcpowmod accepts negative scale and corrupts _one_ definition
Fix bug #72061 - Out-of-bounds reads in zif_grapheme_stripos with negative offset
Fix for bug #71912 (libgd: signedness vulnerability)
Typo in NEWS
Anatol Belski [Wed, 27 Apr 2016 10:24:28 +0000 (12:24 +0200)]
fix merge
Anatol Belski [Wed, 27 Apr 2016 09:45:29 +0000 (11:45 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix memory leak
Fix bug #72099: xml_parse_into_struct segmentation fault
5.5.36 now
Fix bug #72094 - Out of bounds heap read access in exif header processing
Fix bug #72093: bcpowmod accepts negative scale and corrupts _one_ definition
Fix bug #72061 - Out-of-bounds reads in zif_grapheme_stripos with negative offset
Fix for bug #71912 (libgd: signedness vulnerability)
Typo in NEWS
Stanislav Malyshev [Wed, 27 Apr 2016 06:48:41 +0000 (23:48 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix memory leak
Fix bug #72099: xml_parse_into_struct segmentation fault
5.5.36 now
Fix bug #72094 - Out of bounds heap read access in exif header processing
Fix bug #72093: bcpowmod accepts negative scale and corrupts _one_ definition
Fix bug #72061 - Out-of-bounds reads in zif_grapheme_stripos with negative offset
Fix for bug #71912 (libgd: signedness vulnerability)
Typo in NEWS
Conflicts:
configure.in
main/php_version.h
Stanislav Malyshev [Wed, 27 Apr 2016 06:04:40 +0000 (23:04 -0700)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix build
Stanislav Malyshev [Wed, 27 Apr 2016 06:04:29 +0000 (23:04 -0700)]
fix build
Stanislav Malyshev [Wed, 27 Apr 2016 05:59:25 +0000 (22:59 -0700)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fix bug #71923 - integer overflow in ZipArchive::getFrom*
Stanislav Malyshev [Wed, 20 Apr 2016 06:49:22 +0000 (23:49 -0700)]
Fix bug #71923 - integer overflow in ZipArchive::getFrom*
Stanislav Malyshev [Wed, 27 Apr 2016 05:54:58 +0000 (22:54 -0700)]
Fix memory leak
Stanislav Malyshev [Mon, 25 Apr 2016 06:50:57 +0000 (23:50 -0700)]
Fix bug #72099: xml_parse_into_struct segmentation fault
Xinchen Hui [Wed, 27 Apr 2016 04:51:51 +0000 (12:51 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Use zend_string_safe_alloc