]>
granicus.if.org Git - php/log
Anatol Belski [Wed, 23 Dec 2015 17:40:16 +0000 (18:40 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
update NEWS
Anatol Belski [Wed, 23 Dec 2015 17:39:40 +0000 (18:39 +0100)]
update NEWS
Anatol Belski [Wed, 23 Dec 2015 17:38:54 +0000 (18:38 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update NEWS
Added test for bug #71201
Bug #71201 round() segfault on 64-bit builds
Conflicts:
ext/standard/math.c
Anatol Belski [Wed, 23 Dec 2015 17:37:05 +0000 (18:37 +0100)]
update NEWS
Anatol Belski [Wed, 23 Dec 2015 17:31:09 +0000 (18:31 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix merge mistake
Anatol Belski [Wed, 23 Dec 2015 17:30:32 +0000 (18:30 +0100)]
fix merge mistake
Anatol Belski [Wed, 23 Dec 2015 17:29:06 +0000 (18:29 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Added test for bug #71201
Bug #71201 round() segfault on 64-bit builds
Sort 7.0.1 extensions' entries
Conflicts:
ext/standard/math.c
Anatol Belski [Wed, 23 Dec 2015 17:18:02 +0000 (18:18 +0100)]
Added test for bug #71201
Anatol Belski [Wed, 23 Dec 2015 17:16:52 +0000 (18:16 +0100)]
Bug #71201 round() segfault on 64-bit builds
Anatol Belski [Wed, 23 Dec 2015 17:25:28 +0000 (18:25 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Added test for bug #71201
Bug #71201 round() segfault on 64-bit builds
Add CVE for #71020 (PHP 7.0.1)
Lior Kaplan [Wed, 23 Dec 2015 17:25:02 +0000 (19:25 +0200)]
Sort 7.0.1 extensions' entries
Anatol Belski [Wed, 23 Dec 2015 17:24:56 +0000 (18:24 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Added test for bug #71201
Bug #71201 round() segfault on 64-bit builds
Anatol Belski [Wed, 23 Dec 2015 17:18:02 +0000 (18:18 +0100)]
Added test for bug #71201
Anatol Belski [Wed, 23 Dec 2015 17:16:52 +0000 (18:16 +0100)]
Bug #71201 round() segfault on 64-bit builds
Lior Kaplan [Tue, 22 Dec 2015 17:17:15 +0000 (19:17 +0200)]
Add CVE for #71020 (PHP 7.0.1)
Xinchen Hui [Wed, 23 Dec 2015 16:13:46 +0000 (08:13 -0800)]
Merge branch 'master' of git.php.net:/php-src
Xinchen Hui [Wed, 23 Dec 2015 16:13:24 +0000 (08:13 -0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Wed, 23 Dec 2015 16:13:13 +0000 (08:13 -0800)]
Update NEWS & Fixed test
Xinchen Hui [Wed, 23 Dec 2015 16:11:09 +0000 (08:11 -0800)]
Merge branch 'PHP-5.6' into PHP-7.0
Xinchen Hui [Wed, 23 Dec 2015 16:10:59 +0000 (08:10 -0800)]
Fixed bug #71204 (segfault if clean spl_autoload_funcs while autoloading)
Dmitry Stogov [Wed, 23 Dec 2015 16:02:14 +0000 (19:02 +0300)]
Support for optimization introduced in DFA pass (it may change type of instruction return oprand to IS_CV)
Xinchen Hui [Wed, 23 Dec 2015 15:52:36 +0000 (07:52 -0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Wed, 23 Dec 2015 15:52:24 +0000 (07:52 -0800)]
This should never fail
Xinchen Hui [Wed, 23 Dec 2015 15:48:16 +0000 (07:48 -0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Wed, 23 Dec 2015 15:48:00 +0000 (07:48 -0800)]
Fixed bug #71202 (Autoload function registered by another not activated immediately)
Xinchen Hui [Wed, 23 Dec 2015 12:56:49 +0000 (20:56 +0800)]
Dmitry Stogov [Wed, 23 Dec 2015 10:52:15 +0000 (13:52 +0300)]
Consolidate indirect string offset modification checks (Nikita, Dmitry)
Check it once, instead of dozens of times.
Julien Pauli [Wed, 23 Dec 2015 10:38:16 +0000 (11:38 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Updated NEWS
Added support for HTTP 451
Julien Pauli [Wed, 23 Dec 2015 10:37:59 +0000 (11:37 +0100)]
Updated NEWS
Julien Pauli [Wed, 23 Dec 2015 10:33:10 +0000 (11:33 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Added support for HTTP 451
Conflicts:
sapi/cgi/cgi_main.c
sapi/cli/php_cli_server.c
sapi/fpm/fpm/fpm_main.c
Julien Pauli [Wed, 23 Dec 2015 10:31:18 +0000 (11:31 +0100)]
Added support for HTTP 451
Dmitry Stogov [Wed, 23 Dec 2015 00:52:38 +0000 (03:52 +0300)]
Fixed SSA construction for CFG with unreachable BB
Dmitry Stogov [Wed, 23 Dec 2015 00:52:01 +0000 (03:52 +0300)]
Fixed test on 32-bit systems
Dmitry Stogov [Wed, 23 Dec 2015 00:46:40 +0000 (03:46 +0300)]
Remove live-range if the corresponding definition is deleted
Dmitry Stogov [Wed, 23 Dec 2015 00:20:28 +0000 (03:20 +0300)]
Support for incompletely constructed SSA
Dmitry Stogov [Tue, 22 Dec 2015 22:47:38 +0000 (01:47 +0300)]
Fixed bug #71196 (Memory leak with out-of-order live ranges)
Nikita Popov [Tue, 22 Dec 2015 22:08:26 +0000 (23:08 +0100)]
Always create ARRAY_ELEM ssa var for ELEM_REF
Dmitry Stogov [Tue, 22 Dec 2015 18:33:07 +0000 (21:33 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed incorrect setting on 32-bit systems
Dmitry Stogov [Tue, 22 Dec 2015 18:32:45 +0000 (21:32 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed incorrect setting on 32-bit systems
Dmitry Stogov [Tue, 22 Dec 2015 18:31:28 +0000 (21:31 +0300)]
Fixed incorrect setting on 32-bit systems
Dmitry Stogov [Tue, 22 Dec 2015 17:55:11 +0000 (20:55 +0300)]
Corrected error messages:
- we don't use NULL for overlaoded objects for ages
- fixed array/object mess
Julien Pauli [Tue, 22 Dec 2015 17:12:46 +0000 (18:12 +0100)]
Updated NEWS
Ilia Alshanetsky [Wed, 28 Oct 2015 22:38:54 +0000 (18:38 -0400)]
Fixed test
Ilia Alshanetsky [Tue, 27 Oct 2015 16:40:53 +0000 (12:40 -0400)]
Added validation to parse_url() to prohibit restricted characters inside login/pass components based on RFC3986
Bob Weinand [Tue, 22 Dec 2015 16:39:52 +0000 (17:39 +0100)]
Merge branch 'PHP-7.0'
Bob Weinand [Tue, 22 Dec 2015 16:39:36 +0000 (17:39 +0100)]
Added test for (long-ago fixed) bug #70083
Julien Pauli [Tue, 22 Dec 2015 15:28:12 +0000 (16:28 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Updated NEWS
Fix #70720
Align NEWS entry format
Julien Pauli [Tue, 22 Dec 2015 15:27:52 +0000 (16:27 +0100)]
Updated NEWS
Julien Pauli [Tue, 22 Dec 2015 15:26:30 +0000 (16:26 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix #70720
Align NEWS entry format
Julien Pauli [Tue, 22 Dec 2015 15:25:51 +0000 (16:25 +0100)]
Fix #70720
Dmitry Stogov [Tue, 22 Dec 2015 14:35:08 +0000 (17:35 +0300)]
Skip "useless" SSA variables for INIT_ARRAY, ADD_ARRAY_ELEMENT, FE_RESET_R
Dmitry Stogov [Tue, 22 Dec 2015 13:43:37 +0000 (16:43 +0300)]
Add ability to prevent "useless" SSA variable creation for "refcounting inference".
Anatol Belski [Tue, 22 Dec 2015 13:37:05 +0000 (14:37 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
release only appropriate string
Anatol Belski [Tue, 22 Dec 2015 13:33:19 +0000 (14:33 +0100)]
release only appropriate string
Dmitry Stogov [Tue, 22 Dec 2015 12:35:17 +0000 (15:35 +0300)]
Make RC1/RCN inference more accurate (it's probably not 100% correct anyway)
Anatol Belski [Tue, 22 Dec 2015 12:19:33 +0000 (13:19 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
Anatol Belski [Tue, 22 Dec 2015 12:18:21 +0000 (13:18 +0100)]
update NEWS
Anatol Belski [Tue, 22 Dec 2015 09:49:38 +0000 (10:49 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
7.0.3 next
Anatol Belski [Tue, 22 Dec 2015 09:48:32 +0000 (10:48 +0100)]
7.0.3 next
Xinchen Hui [Tue, 22 Dec 2015 04:29:00 +0000 (12:29 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #71190 (substr_replace converts integers in original $search array to strings)
Xinchen Hui [Tue, 22 Dec 2015 04:07:44 +0000 (12:07 +0800)]
Fixed bug #71190 (substr_replace converts integers in original $search array to strings)
Xinchen Hui [Tue, 22 Dec 2015 03:07:42 +0000 (11:07 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed #71188 (str_replace converts integers in original $search array to strings)
Xinchen Hui [Tue, 22 Dec 2015 03:07:30 +0000 (11:07 +0800)]
Fixed #71188 (str_replace converts integers in original $search array to strings)
Lior Kaplan [Mon, 21 Dec 2015 21:14:23 +0000 (23:14 +0200)]
Align NEWS entry format
Dmitry Stogov [Mon, 21 Dec 2015 16:46:55 +0000 (19:46 +0300)]
Get rid of MAY_BE_DEF
Dmitry Stogov [Mon, 21 Dec 2015 15:39:24 +0000 (18:39 +0300)]
Split MAY_BE_NULL from MAY_BE_UNDEF
Nikita Popov [Sun, 20 Dec 2015 12:42:26 +0000 (13:42 +0100)]
Remove uses of VARs in extended_value
The DECLARE_(ANON_)INHERITED_CLASS(_DELAYED) opcodes were
referencing the parent ce VAR through extended_value. This is
hacky and we can't track the def-use chain in SSA.
To avoid this, the layout of declaration opcodes is changed
as follows: op1 points to the lcname and rtd_key literals, in
that order. (For anon/lambda declarations only one of lcname or
rtd_key is present.) This frees up op2, which is now used to
reference the parent ce VAR in inheriting declarations. The
jmp offset for anon class declarations is moved frop op2 to
extended_value.
The changes were applied both to class and function declarations
to keep everything symmetric.
Dmitry Stogov [Mon, 21 Dec 2015 12:58:58 +0000 (15:58 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed possible crash on Zend/tests/bug71154.phpt
Dmitry Stogov [Mon, 21 Dec 2015 12:57:53 +0000 (15:57 +0300)]
Fixed possible crash on Zend/tests/bug71154.phpt
Anatol Belski [Mon, 21 Dec 2015 11:10:49 +0000 (12:10 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Revert "Partially fix bug #71129"
Anatol Belski [Mon, 21 Dec 2015 11:09:24 +0000 (12:09 +0100)]
Revert "Partially fix bug #71129"
This reverts commit
4c55669caa96f6202c2047a7baf6c5d5894d5fa7 .
The way it is fixes doesn't satisfy every SAPI, so a better solution
is yet to work out.
Xinchen Hui [Mon, 21 Dec 2015 10:13:11 +0000 (18:13 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed typo
Xinchen Hui [Mon, 21 Dec 2015 10:12:57 +0000 (18:12 +0800)]
Fixed typo
Xinchen Hui [Mon, 21 Dec 2015 10:11:01 +0000 (18:11 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #71178 (preg_replace with arrays creates [0] in replace array if not already set)
Align #71165 entry format
Xinchen Hui [Mon, 21 Dec 2015 10:09:59 +0000 (18:09 +0800)]
Fixed bug #71178 (preg_replace with arrays creates [0] in replace array if not already set)
Lior Kaplan [Sun, 20 Dec 2015 21:48:25 +0000 (23:48 +0200)]
Align #71165 entry format
Anatol Belski [Sun, 20 Dec 2015 14:27:13 +0000 (15:27 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Partially fix bug #71129
Typo
Bug #71105 was fixed in 7.0.1 (commit
9374ba35 )
Anatol Belski [Sun, 20 Dec 2015 14:25:11 +0000 (15:25 +0100)]
Partially fix bug #71129
Nikita Popov [Sun, 20 Dec 2015 11:47:39 +0000 (12:47 +0100)]
Protect against overflows in pi constraints
Xinchen Hui [Sun, 20 Dec 2015 02:53:34 +0000 (18:53 -0800)]
Merge branch 'master' of git.php.net:/php-src
Xinchen Hui [Sun, 20 Dec 2015 02:40:58 +0000 (18:40 -0800)]
typo agian :<
Yasuo Ohgaki [Sun, 20 Dec 2015 02:36:58 +0000 (11:36 +0900)]
Add session module test
Nikita Popov [Sat, 19 Dec 2015 22:59:29 +0000 (23:59 +0100)]
long -> zend_long in range inference
Nikita Popov [Sat, 19 Dec 2015 22:47:08 +0000 (23:47 +0100)]
Fix Pi constraint for -LONG_MIN adjustments
-LONG_MIN == LONG_MIN so bad things will happen.
Example of JIT miscompile:
function test($n) {
if ($n + PHP_INT_MIN == 0) {
$n2 = (int) ($n + PHP_INT_MAX);
var_dump($n2);
}
}
test(PHP_INT_MAX + 1);
Nikita Popov [Sat, 19 Dec 2015 22:20:31 +0000 (23:20 +0100)]
Extrace find_adjusted_tmp_var() function
This code was duplicated for op1 and op2
Nikita Popov [Sat, 19 Dec 2015 20:00:38 +0000 (21:00 +0100)]
Simplify bf/bt computation in pi placement
The meaning of the successors is well-defined, no need to check it.
Nikita Popov [Sat, 19 Dec 2015 19:48:12 +0000 (20:48 +0100)]
Fix typo in pi placement
Xinchen Hui [Sat, 19 Dec 2015 13:45:44 +0000 (05:45 -0800)]
Added note to upgrading
Xinchen Hui [Sat, 19 Dec 2015 13:44:29 +0000 (05:44 -0800)]
Typo
Lior Kaplan [Sat, 19 Dec 2015 11:19:43 +0000 (13:19 +0200)]
Bug #71105 was fixed in 7.0.1 (commit
9374ba35 )
Xinchen Hui [Sat, 19 Dec 2015 05:55:04 +0000 (21:55 -0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Sat, 19 Dec 2015 05:54:57 +0000 (21:54 -0800)]
Fixed NEWS
Xinchen Hui [Sat, 19 Dec 2015 05:52:15 +0000 (21:52 -0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Sat, 19 Dec 2015 05:52:05 +0000 (21:52 -0800)]
Fixed bug #71165 (-DGC_BENCH=1 doesn't work on PHP7)
Xinchen Hui [Sat, 19 Dec 2015 05:43:08 +0000 (21:43 -0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Sat, 19 Dec 2015 05:40:48 +0000 (21:40 -0800)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
Xinchen Hui [Sat, 19 Dec 2015 05:40:20 +0000 (21:40 -0800)]
Fixed bug #71163 (Segmentation Fault: cleanup_unfinished_calls)
Andrea Faulds [Sat, 19 Dec 2015 02:35:19 +0000 (02:35 +0000)]
Merge branch 'PHP-7.0'
Andrea Faulds [Sat, 19 Dec 2015 02:25:44 +0000 (02:25 +0000)]
Fix bug #70804
This follows on from
a4648ded430985e019b446939c4ff5bef36c0b91 and
4e01269082d20f5598c481f122b3eea10a586e2b .
Both -(+0.0) and +(-0.0) behaved incorrectly for the same reason.
Andrea Faulds [Fri, 18 Dec 2015 19:32:20 +0000 (19:32 +0000)]
Merge branch 'PHP-7.0'