]>
granicus.if.org Git - php/log
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
Xinchen Hui [Wed, 27 Apr 2016 04:23:51 +0000 (12:23 +0800)]
Use zend_string_safe_alloc
Dmitry Stogov [Tue, 26 Apr 2016 21:24:20 +0000 (00:24 +0300)]
Optimize property guards for the most usual case with only one acive guard.
Julien Pauli [Tue, 26 Apr 2016 20:34:00 +0000 (22:34 +0200)]
5.5.36 now
Dmitry Stogov [Tue, 26 Apr 2016 10:45:02 +0000 (13:45 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed test on 32-bit platforms (split into 32-bit and 64-bit versions)
Dmitry Stogov [Tue, 26 Apr 2016 10:44:52 +0000 (13:44 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed test on 32-bit platforms (split into 32-bit and 64-bit versions)
Dmitry Stogov [Tue, 26 Apr 2016 10:43:18 +0000 (13:43 +0300)]
Fixed test on 32-bit platforms (split into 32-bit and 64-bit versions)
Dmitry Stogov [Tue, 26 Apr 2016 10:06:16 +0000 (13:06 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #72100 (implode() inserts garbage into resulting string when joins very big integer). (Mikhail Galanin)
Dmitry Stogov [Tue, 26 Apr 2016 10:04:06 +0000 (13:04 +0300)]
Fixed bug #72100 (implode() inserts garbage into resulting string when joins very big integer). (Mikhail Galanin)
Dmitry Stogov [Mon, 25 Apr 2016 11:48:36 +0000 (14:48 +0300)]
Skip test on ZTS build
Dmitry Stogov [Mon, 25 Apr 2016 11:15:06 +0000 (14:15 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #72101 (crash on complex code)
Dmitry Stogov [Mon, 25 Apr 2016 11:11:46 +0000 (14:11 +0300)]
Fixed bug #72101 (crash on complex code)
Dmitry Stogov [Mon, 25 Apr 2016 10:01:14 +0000 (13:01 +0300)]
Fixed race conditions in test
Stanislav Malyshev [Mon, 25 Apr 2016 02:33:52 +0000 (19:33 -0700)]
Fix bug #72094 - Out of bounds heap read access in exif header processing
Stanislav Malyshev [Mon, 25 Apr 2016 01:33:32 +0000 (18:33 -0700)]
Fix bug #72093: bcpowmod accepts negative scale and corrupts _one_ definition
We can not modify result since it can be copy of _zero_ or _one_, etc. and
"copy" in bcmath is just bumping the refcount.
Stanislav Malyshev [Sun, 24 Apr 2016 19:49:01 +0000 (12:49 -0700)]
Fix bug #72061 - Out-of-bounds reads in zif_grapheme_stripos with negative offset
Nikita Popov [Tue, 2 Feb 2016 16:18:19 +0000 (17:18 +0100)]
Take pi defs into account when propagating defs
Previously pi placement happened after initial phi placement.
Afterwards a second phi placement pass was performed, however it
incorrectly only placed phis on the dominance frontier, rather
than the iterated dominance frontier.
This is fixed by moving pi placement before the propagation of
defs on the iterated DFs, and adding a def for each added pi.
While this ensures that we generate correct conservative SSA, there
is still one remaining case in which we may generate non-minimal
SSA form. Consider:
|1|
|pi
v
|2|<--\
| |
\----/
The pi is semanically located along the edge 1->2, however we place
it (and its def point) in 2, thus leading to the generation of an
additional (trivial) phi in 2.
Conflicts:
ext/opcache/Optimizer/zend_ssa.c
Nikita Popov [Tue, 2 Feb 2016 16:12:16 +0000 (17:12 +0100)]
Make pi placement independent of phi placement
This interdependence is problematic because we can't propagate pi
def points in the initial dominance frontier propagation. The used
rule for multiple-predecessor blocks may also miss cases where
placing the pi would have been useful.
The new heuristic for pi placement checks that a) the variable is
live-in and b) for the "from" block that generated the pi, the
other successor does not dominate all other predecessors of the
"to" block.
The purpose of case b) may be illustrated with an example:
if (is_int($i)) {
// place pi here
}
// but don't place pi here
The reason we do not want to place the second pi is that we generally
place pis in positive+negative pairs, and in this case the pair
would merge in a phi and cancel out, so we get no useful information
out of it.
Nikita Popov [Sun, 24 Apr 2016 15:15:46 +0000 (17:15 +0200)]
Drop some unnecessary checks
Nikita Popov [Sun, 24 Apr 2016 15:04:22 +0000 (17:04 +0200)]
Introduce ZEND_BITSET_FOREACH macros
Pierrick Charron [Sun, 24 Apr 2016 02:55:46 +0000 (22:55 -0400)]
Merge branch 'PHP-7.0'
Pierrick Charron [Sun, 24 Apr 2016 02:55:00 +0000 (22:55 -0400)]
Fixed bug #68658 (Define CURLE_SSL_CACERT_BADFILE)
Pierrick Charron [Sat, 23 Apr 2016 22:38:51 +0000 (18:38 -0400)]
Merge branch 'PHP-7.0'
Pierrick Charron [Sat, 23 Apr 2016 22:37:55 +0000 (18:37 -0400)]
Fix cURL test to use local server instead of google
Anatol Belski [Sat, 23 Apr 2016 17:22:22 +0000 (19:22 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #72035 php-cgi.exe fails to run scripts relative to drive root
Anatol Belski [Thu, 21 Apr 2016 19:17:33 +0000 (21:17 +0200)]
Fixed bug #72035 php-cgi.exe fails to run scripts relative to drive root
Xinchen Hui [Sat, 23 Apr 2016 04:41:52 +0000 (21:41 -0700)]
Merge branch 'PHP-7.0'
Xinchen Hui [Sat, 23 Apr 2016 04:41:44 +0000 (21:41 -0700)]
Fixed bug #72069 (Behavior \JsonSerializable different from json_encode)
Xinchen Hui [Sat, 23 Apr 2016 04:22:01 +0000 (21:22 -0700)]
Merge branch 'PHP-7.0'
Xinchen Hui [Sat, 23 Apr 2016 04:20:53 +0000 (21:20 -0700)]
Fixed bug #72075 (Referencing socket resources breaks stream_select)
Nikita Popov [Fri, 22 Apr 2016 15:48:35 +0000 (17:48 +0200)]
Make zval_ptr_dtor / _zval_dtor_func more robust
In particular, allow arrays with refcount>1, like we already allow
for all other types. _zval_dtor_func is now the same as
_zval_dtor_func_for_ptr with an extra refcount decrement check at
the start. At this point we might as well drop it...
Nikita Popov [Thu, 21 Apr 2016 21:48:41 +0000 (23:48 +0200)]
Adjust DFG allocation size
Now we need one set less...
Nikita Popov [Wed, 20 Apr 2016 22:14:30 +0000 (00:14 +0200)]
Make MAY_BE_ERROR handling more accurate
This ended up causing weird things like MAY_BE_ERROR CVs.
Also make sure that ASSIGN result isn't MAY_BE_REF.
Nikita Popov [Thu, 21 Apr 2016 21:42:20 +0000 (23:42 +0200)]
Merge branch 'PHP-7.0'
Nikita Popov [Thu, 21 Apr 2016 21:41:59 +0000 (23:41 +0200)]
Fix escape sequences in pgsql.c
Nikita Popov [Thu, 21 Apr 2016 21:35:51 +0000 (23:35 +0200)]
Mark zend_timeout as noreturn
Otherwise we get a compiler warning...
Nikita Popov [Thu, 21 Apr 2016 21:12:28 +0000 (23:12 +0200)]
Merge def and gen sets
For live-variable analysis it does not matter if def includes
variables that are previously use in the same block, the data flow
equations still have the same result. As such there is no need to
compute separate gen & def sets.
I'm keeping the name "def", because use of "gen" in this context is
pretty confusing (gen is usually the use set, not the def set).
Bob Weinand [Thu, 21 Apr 2016 19:51:50 +0000 (21:51 +0200)]
Merge branch 'PHP-7.0'
Bob Weinand [Thu, 21 Apr 2016 19:51:00 +0000 (21:51 +0200)]
Fix constant expr coaleasce with protected mode opcache
Dmitry Stogov [Thu, 21 Apr 2016 19:37:13 +0000 (22:37 +0300)]
Added news entry
Dmitry Stogov [Thu, 21 Apr 2016 07:15:57 +0000 (10:15 +0300)]
Merge branch 'master' into safe_timeout
* master:
Fixed bug #72059 - Reference the bug id directly in NEWS
Fix magic constants (__LINE__) with ?? for constant scalar exprs
Add NEWS entry for ?? in constant scalar expressions
allow null coalescing (??) on constant expressions
Fix intl tests for ICU < 52
Fix ZTS builds by adding a missing TSRMLS_FETCH().
Fix bug #71737
Update NEWS
Fix RECV opcode to handle all kinds of exceptions
Fix RECV opcode to handle all kinds of exceptions
Bob Weinand [Thu, 21 Apr 2016 00:50:14 +0000 (02:50 +0200)]
Merge remote-tracking branch 'origin/PHP-7.0'
Bob Weinand [Thu, 21 Apr 2016 00:48:52 +0000 (02:48 +0200)]
Fixed bug #72059 - Reference the bug id directly in NEWS
Bob Weinand [Thu, 21 Apr 2016 00:45:09 +0000 (02:45 +0200)]
Fix magic constants (__LINE__) with ?? for constant scalar exprs
Also fix general memory leak when root ast gets replaced in compile time evaluation
Bob Weinand [Wed, 20 Apr 2016 23:26:48 +0000 (01:26 +0200)]
Merge remote-tracking branch 'origin/PHP-7.0'
Bob Weinand [Wed, 20 Apr 2016 23:24:56 +0000 (01:24 +0200)]
Add NEWS entry for ?? in constant scalar expressions
Márcio Almada [Sun, 17 Apr 2016 08:27:15 +0000 (04:27 -0400)]
allow null coalescing (??) on constant expressions
Nikita Popov [Wed, 20 Apr 2016 17:43:15 +0000 (19:43 +0200)]
Fix intl tests for ICU < 52
Nikita Popov [Wed, 20 Apr 2016 17:00:13 +0000 (19:00 +0200)]
Merge branch 'PHP-7.0'
Nikita Popov [Wed, 20 Apr 2016 17:00:02 +0000 (19:00 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
Zend/zend_compile.c
Adam Harvey [Tue, 19 Apr 2016 02:20:35 +0000 (19:20 -0700)]
Fix ZTS builds by adding a missing TSRMLS_FETCH().
Nikita Popov [Wed, 20 Apr 2016 16:43:43 +0000 (18:43 +0200)]
Merge branch 'PHP-7.0'
Nikita Popov [Wed, 20 Apr 2016 16:37:23 +0000 (18:37 +0200)]
Fix bug #71737
Also improve the error message for $this used in parameters.
Xinchen Hui [Wed, 20 Apr 2016 15:43:54 +0000 (08:43 -0700)]
Merge branch 'PHP-7.0'
Xinchen Hui [Wed, 20 Apr 2016 15:42:06 +0000 (08:42 -0700)]
Update NEWS
Nikita Nefedov [Tue, 19 Apr 2016 16:26:08 +0000 (19:26 +0300)]
Fix RECV opcode to handle all kinds of exceptions
fix RECV opcode to handle exceptions thrown from user-defined error handler
as a result Notice error from failed type coercion
Xinchen Hui [Wed, 20 Apr 2016 15:40:11 +0000 (08:40 -0700)]
Merge branch 'fix-recv-opcode-handle-exception' of https://github.com/nikita2206/php-src
Dmitry Stogov [Wed, 20 Apr 2016 10:52:21 +0000 (13:52 +0300)]
Safe execution timeout handling.
Nikita Nefedov [Tue, 19 Apr 2016 16:26:08 +0000 (19:26 +0300)]
Fix RECV opcode to handle all kinds of exceptions
fix RECV opcode to handle exceptions thrown from user-defined error handler
as a result Notice error from failed type coercion
Dmitry Stogov [Wed, 20 Apr 2016 08:06:52 +0000 (11:06 +0300)]
Reduced amount of code generated for interrupt handling.
Improved ZEND_VM_INTERRUPT_CHECK() placement (always perform checks after opcode handler completion, when instruction pointer value is alredy changed to the next opcode).
Stanislav Malyshev [Wed, 20 Apr 2016 06:45:33 +0000 (23:45 -0700)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Better fix for #71952
Stanislav Malyshev [Wed, 20 Apr 2016 06:45:21 +0000 (23:45 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Better fix for #71952
Conflicts:
ext/gd/gd.c
Stanislav Malyshev [Wed, 20 Apr 2016 06:44:00 +0000 (23:44 -0700)]
Better fix for #71952
Stanislav Malyshev [Tue, 19 Apr 2016 06:34:44 +0000 (23:34 -0700)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fix bug #71952: Corruption inside imageaffinematrixget
Stanislav Malyshev [Tue, 19 Apr 2016 06:34:26 +0000 (23:34 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix bug #71952: Corruption inside imageaffinematrixget
Conflicts:
ext/gd/gd.c
Stanislav Malyshev [Tue, 19 Apr 2016 06:31:03 +0000 (23:31 -0700)]
Fix bug #71952: Corruption inside imageaffinematrixget
Stanislav Malyshev [Tue, 19 Apr 2016 05:20:22 +0000 (22:20 -0700)]
Fix for bug #71912 (libgd: signedness vulnerability)
Xinchen Hui [Tue, 19 Apr 2016 03:03:57 +0000 (11:03 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #72051 (The reference in CallbackFilterIterator doesn't work as expected)
Xinchen Hui [Tue, 19 Apr 2016 02:59:35 +0000 (10:59 +0800)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:/php-src:
Prevent usage in GC after free.
Fix SEND_USER as well
Fix SEND_ARRAY+PREFER_REF SHM corruption
Xinchen Hui [Tue, 19 Apr 2016 02:59:10 +0000 (10:59 +0800)]
Fixed bug #72051 (The reference in CallbackFilterIterator doesn't work as expected)
Sara Golemon [Mon, 18 Apr 2016 23:14:08 +0000 (23:14 +0000)]
Add NEWS entry for rfc:intl.timezone.get-windows-id
Sara Golemon [Wed, 16 Mar 2016 00:32:36 +0000 (00:32 +0000)]
Update IntlTimeZone methods for ICU 52
Adds:
string IntlTimeZone::getWindowsID(string id)
string IntlTimeZone::getIDForWindowsID(string winID[, string region])
And matching procedural functions
Dmitry Stogov [Mon, 18 Apr 2016 22:37:45 +0000 (01:37 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Prevent usage in GC after free.
Dmitry Stogov [Mon, 18 Apr 2016 22:37:24 +0000 (01:37 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Prevent usage in GC after free.
Dmitry Stogov [Mon, 18 Apr 2016 22:31:49 +0000 (01:31 +0300)]
Prevent usage in GC after free.
Bob Weinand [Mon, 18 Apr 2016 21:54:41 +0000 (23:54 +0200)]
Fix generator being a cycle to itself
Nikita Popov [Sun, 17 Apr 2016 15:19:03 +0000 (17:19 +0200)]
Fully initialize DECLARE_CLASS/FUNCTION opcodes
Nikita Popov [Mon, 18 Apr 2016 20:46:36 +0000 (22:46 +0200)]
Merge branch 'PHP-7.0'
Nikita Popov [Mon, 18 Apr 2016 20:45:38 +0000 (22:45 +0200)]
Fix SEND_USER as well
Missed copy&paste code here