]>
granicus.if.org Git - php/log
Dmitry Stogov [Fri, 13 May 2016 11:46:43 +0000 (14:46 +0300)]
Added news entries
Dmitry Stogov [Fri, 13 May 2016 11:38:43 +0000 (14:38 +0300)]
Fixed bug #72188 (Nested try/finally blocks losing return value)
Dmitry Stogov [Fri, 13 May 2016 08:55:09 +0000 (11:55 +0300)]
Fixed bug #72177 (Scope issue in __destruct after ReflectionProperty::setValue())
Joe Watkins [Fri, 13 May 2016 08:21:28 +0000 (09:21 +0100)]
Joe Watkins [Fri, 13 May 2016 06:43:49 +0000 (07:43 +0100)]
fix #72180 (Env variables incorrectly pretty printed in config.nice, phpinfo)
Dmitry Stogov [Thu, 12 May 2016 22:40:15 +0000 (01:40 +0300)]
Eliminated checks for (func->op_array.fn_flags & ZEND_ACC_GENERATOR) in fast path of DO_FCALL* handlers.
This slightly improves calls to regular function and method calls in cost of a bit slower generator initialization.
Separate call frame for generators, allocated on heap, now created by ZEND_GENERATOR_CREATE instruction.
Nikita Popov [Thu, 12 May 2016 19:57:19 +0000 (21:57 +0200)]
Fix phi placement for pi targets
If the pi target has multiple predecessors, we need to place a
phi there. However it's not possible to express this in terms of
dominance frontiers, so we need to explicitly add it to the phi
set.
This does not yet solve the problem of non-minimal SSA for the
case where the target has multiple predecessors, but dominates
all predecessors (apart from the one creating the pi) -- but
that's an existing issue.
Nikita Popov [Thu, 12 May 2016 19:41:24 +0000 (21:41 +0200)]
Explicitly construct phi set during def propagation
Previously the phi set was first computed during def propagation
and then computed again (per-block) during actual phi placement.
This commit changes this to store the phi set computed during
def propagation.
This makes SSA construction slightly faster (5%), but the main
purpose here is to pave the way for the next commit.
This also fixes a potential issue with the handling of irreducible
loops -- they generated additional phis, but these were not
accounted for in def propagation. (Though I'm not sure if we can
even have any irreducible loops right now.)
Anatol Belski [Thu, 12 May 2016 18:38:02 +0000 (20:38 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix dir separator in test
Anatol Belski [Thu, 12 May 2016 18:37:04 +0000 (20:37 +0200)]
fix dir separator in test
Dmitry Stogov [Thu, 12 May 2016 13:46:37 +0000 (16:46 +0300)]
Removed useless code
Anatol Belski [Thu, 12 May 2016 11:39:39 +0000 (13:39 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
Anatol Belski [Thu, 12 May 2016 11:39:15 +0000 (13:39 +0200)]
update NEWS
Anatol Belski [Thu, 12 May 2016 10:49:31 +0000 (12:49 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
workaround the extra new line in the test out on another env
Dmitry Stogov [Thu, 12 May 2016 10:47:22 +0000 (13:47 +0300)]
Intern some known (and offten used) strings.
Anatol Belski [Thu, 12 May 2016 10:45:04 +0000 (12:45 +0200)]
workaround the extra new line in the test out on another env
Anatol Belski [Thu, 12 May 2016 09:41:18 +0000 (11:41 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #72197 pg_lo_create arbitrary read
Anatol Belski [Thu, 12 May 2016 09:40:28 +0000 (11:40 +0200)]
Fixed bug #72197 pg_lo_create arbitrary read
Xinchen Hui [Thu, 12 May 2016 05:48:52 +0000 (13:48 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Added NEWS entry missed while doing merge
Xinchen Hui [Thu, 12 May 2016 05:48:24 +0000 (13:48 +0800)]
Added NEWS entry missed while doing merge
Xinchen Hui [Thu, 12 May 2016 05:40:32 +0000 (13:40 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Committed by accident
Xinchen Hui [Thu, 12 May 2016 05:40:22 +0000 (13:40 +0800)]
Committed by accident
Xinchen Hui [Thu, 12 May 2016 05:16:07 +0000 (13:16 +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:
Fix serializing ZEND_AST_SHELL_EXEC
add missing NEWS entry
prepare for 5.6.22RC1
add missing NEWS entry
Xinchen Hui [Thu, 12 May 2016 05:15:57 +0000 (13:15 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #72195 (pg_pconnect/pg_connect cause use-after-free)
Xinchen Hui [Thu, 12 May 2016 05:15:33 +0000 (13:15 +0800)]
Fixed bug #72195 (pg_pconnect/pg_connect cause use-after-free)
Sara Golemon [Thu, 12 May 2016 02:51:14 +0000 (02:51 +0000)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fix serializing ZEND_AST_SHELL_EXEC
Sara Golemon [Thu, 12 May 2016 02:28:57 +0000 (02:28 +0000)]
Fix serializing ZEND_AST_SHELL_EXEC
Currently, `foo` is reserialized as `'foo'` due to misuse of zend_ast_export().
ZEND_AST_SHELL_EXEC can only contain ZEND_AST_ZVAL(string) or ZEND_AST_ENCAPS_LIST,
so just handle the ZEND_AST_ZVAL(string) case directly.
Dmitry Stogov [Wed, 11 May 2016 21:44:18 +0000 (00:44 +0300)]
Use main VM stack for generators. Only single call frame for generator itself is allocated on heap, call frames for nested functions are allocated on main VM stack. In case "yield" used in context of another function call, call stack has to be frozen and then restored.
Ferenc Kovacs [Wed, 11 May 2016 21:32:27 +0000 (23:32 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
add missing NEWS entry
prepare for 5.6.22RC1
add missing NEWS entry
Ferenc Kovacs [Wed, 11 May 2016 21:31:52 +0000 (23:31 +0200)]
add missing NEWS entry
Ferenc Kovacs [Wed, 11 May 2016 21:31:09 +0000 (23:31 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
prepare for 5.6.22RC1
add missing NEWS entry
Ferenc Kovacs [Wed, 11 May 2016 21:30:04 +0000 (23:30 +0200)]
prepare for 5.6.22RC1
Ferenc Kovacs [Wed, 11 May 2016 21:29:23 +0000 (23:29 +0200)]
add missing NEWS entry
Dmitry Stogov [Wed, 11 May 2016 09:55:33 +0000 (12:55 +0300)]
Added test
Xinchen Hui [Wed, 11 May 2016 09:32:06 +0000 (17:32 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed Bug #72193 (dns_get_record returns array containing elements of type 'unknown')
Xinchen Hui [Wed, 11 May 2016 09:31:46 +0000 (17:31 +0800)]
Fixed Bug #72193 (dns_get_record returns array containing elements of type 'unknown')
Xinchen Hui [Wed, 11 May 2016 03:12:46 +0000 (11:12 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #71573 (Segfault (core dumped) if paramno beyond bound)
Xinchen Hui [Wed, 11 May 2016 03:12:27 +0000 (11:12 +0800)]
Fixed bug #71573 (Segfault (core dumped) if paramno beyond bound)
Derick Rethans [Tue, 10 May 2016 19:40:09 +0000 (15:40 -0400)]
Merge branch 'PHP-7.0'
Derick Rethans [Tue, 10 May 2016 19:40:03 +0000 (15:40 -0400)]
Allow for special case for the opcache zend extension
Anatol Belski [Tue, 10 May 2016 18:03:27 +0000 (20:03 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix handle leak
Anatol Belski [Tue, 10 May 2016 18:02:17 +0000 (20:02 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix handle leak
Anatol Belski [Tue, 10 May 2016 17:59:21 +0000 (19:59 +0200)]
fix handle leak
Dmitry Stogov [Tue, 10 May 2016 14:53:43 +0000 (17:53 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
The "flock" structure has to be writable on AIX.
Dmitry Stogov [Tue, 10 May 2016 14:53:33 +0000 (17:53 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
The "flock" structure has to be writable on AIX.
Dmitry Stogov [Tue, 10 May 2016 14:50:14 +0000 (17:50 +0300)]
The "flock" structure has to be writable on AIX.
Anatol Belski [Tue, 10 May 2016 11:10:35 +0000 (13:10 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
prepare next 7.0.8
Anatol Belski [Tue, 10 May 2016 11:06:55 +0000 (13:06 +0200)]
prepare next 7.0.8
Nikita Popov [Tue, 10 May 2016 10:17:54 +0000 (12:17 +0200)]
Merge branch 'PHP-7.0'
Conflicts:
ext/reflection/php_reflection.c
Nikita Popov [Thu, 5 May 2016 12:57:32 +0000 (14:57 +0200)]
Don't HT_ASSERT rc=1 in zend_hash_apply functions
These are not necessarily used to modify the hash. Move the assert
into the APPLY_REMOVE branch only.
Nikita Popov [Tue, 10 May 2016 10:13:10 +0000 (12:13 +0200)]
Fixed bug #72174
Also fixes a memory leak if ::getValue() is used with __get().
Anatol Belski [Mon, 9 May 2016 16:52:21 +0000 (18:52 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
update NEWS
Anatol Belski [Mon, 9 May 2016 16:51:54 +0000 (18:51 +0200)]
update NEWS
Anatol Belski [Mon, 9 May 2016 16:51:25 +0000 (18:51 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update NEWS
Anatol Belski [Mon, 9 May 2016 16:50:40 +0000 (18:50 +0200)]
update NEWS
Anatol Belski [Mon, 9 May 2016 15:29:56 +0000 (17:29 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Revert "Fixed bug #71820 pg_fetch_object bind parameters before call constructor"
Revert "Backport patch for bug #71820"
Anatol Belski [Mon, 9 May 2016 15:25:53 +0000 (17:25 +0200)]
Revert "Fixed bug #71820 pg_fetch_object bind parameters before call constructor"
This reverts commit
b4eedd128ba9f61be08a50c94afd72837d7cf70b .
This fixed bug #72151, and reverts the fix for bug #71820.
See also bug #50636 and #49521 for the history.
Anatol Belski [Mon, 9 May 2016 15:23:40 +0000 (17:23 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Revert "Backport patch for bug #71820"
Anatol Belski [Mon, 9 May 2016 15:15:40 +0000 (17:15 +0200)]
Revert "Backport patch for bug #71820"
This reverts commit
1b632cfe834bfd87d182566d7d960df7d10ded72 .
This fixed bug #72151, and reverts the fix for bug #71820.
See also bug #50636 and #49521 for the history.
Anatol Belski [Sun, 8 May 2016 13:13:01 +0000 (15:13 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #64524 Add intl.use_exceptions to php.ini-*
Anatol Belski [Sun, 8 May 2016 13:12:20 +0000 (15:12 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed bug #64524 Add intl.use_exceptions to php.ini-*
Anatol Belski [Sun, 8 May 2016 13:09:50 +0000 (15:09 +0200)]
Fixed bug #64524 Add intl.use_exceptions to php.ini-*
Xinchen Hui [Sun, 8 May 2016 05:05:05 +0000 (22:05 -0700)]
Merge branch 'PHP-7.0'
Xinchen Hui [Sun, 8 May 2016 05:04:31 +0000 (22:04 -0700)]
Remove unnecessary strlen check
Xinchen Hui [Sun, 8 May 2016 05:04:20 +0000 (22:04 -0700)]
Fixed test
Bob Weinand [Sat, 7 May 2016 12:45:29 +0000 (14:45 +0200)]
Fix include_once in phpdbg
Xinchen Hui [Sat, 7 May 2016 07:08:35 +0000 (00:08 -0700)]
Merge branch 'PHP-7.0'
Xinchen Hui [Sat, 7 May 2016 07:07:04 +0000 (00:07 -0700)]
Strlen cleanup (additions for previous one fix)
Probably compilers will do similar optimization
Xinchen Hui [Sat, 7 May 2016 06:55:13 +0000 (23:55 -0700)]
Merge branch 'patch-1' of https://github.com/Valkyrurr/php-src
Xinchen Hui [Sat, 7 May 2016 06:54:48 +0000 (23:54 -0700)]
Merge branch 'PHP-7.0'
Xinchen Hui [Sat, 7 May 2016 06:52:48 +0000 (23:52 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
Zend/zend_strtod.c
Xinchen Hui [Sat, 7 May 2016 06:52:06 +0000 (23:52 -0700)]
Fixed bug #72172 (zend_hex_strtod should not use strlen)
Xinchen Hui [Fri, 6 May 2016 12:25:43 +0000 (20:25 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Revert "Fixed bug #72170 (JsonSerializable may inc apply count without dec it)"
Xinchen Hui [Fri, 6 May 2016 12:25:24 +0000 (20:25 +0800)]
Revert "Fixed bug #72170 (JsonSerializable may inc apply count without dec it)"
This reverts commit
459a7cc209da130256d66c1f896199540f4dadbc .
Xinchen Hui [Fri, 6 May 2016 10:48:28 +0000 (18:48 +0800)]
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Add $http_response_header tests
Xinchen Hui [Fri, 6 May 2016 10:39:18 +0000 (18:39 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #72170 (JsonSerializable may inc apply count without dec it)
Xinchen Hui [Fri, 6 May 2016 10:38:26 +0000 (18:38 +0800)]
Fixed bug #72170 (JsonSerializable may inc apply count without dec it)
I don't want use zend_try here, but seems I have no choice :<
Nikita Popov [Fri, 6 May 2016 10:36:07 +0000 (12:36 +0200)]
Add $http_response_header tests
Looks like we didn't have a single test for this functionality :/
Dmitry Stogov [Fri, 6 May 2016 09:36:21 +0000 (12:36 +0300)]
Fixed possible crash
Dmitry Stogov [Fri, 6 May 2016 07:09:04 +0000 (10:09 +0300)]
Reimplemented Bob's commit
bac6fdb0c52c924e726c5a78de8858bf27b6586b without insignificant renaming and white-space changes
Dmitry Stogov [Fri, 6 May 2016 06:48:58 +0000 (09:48 +0300)]
Fixed typo
Dmitry Stogov [Fri, 6 May 2016 06:23:37 +0000 (09:23 +0300)]
Revert "Refactor zval cleanup into single function"
This reverts commit
bac6fdb0c52c924e726c5a78de8858bf27b6586b .
Anatol Belski [Fri, 6 May 2016 07:41:44 +0000 (09:41 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
reorder entry alphabetically
Anatol Belski [Fri, 6 May 2016 07:41:21 +0000 (09:41 +0200)]
update NEWS
Anatol Belski [Fri, 6 May 2016 07:39:02 +0000 (09:39 +0200)]
reorder entry alphabetically
Anatol Belski [Fri, 6 May 2016 07:33:22 +0000 (09:33 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Re-fix #72165
Revert "Fixed bug #72165 Null pointer dereference - openssl_csr_new"
Anatol Belski [Fri, 6 May 2016 07:30:41 +0000 (09:30 +0200)]
Re-fix #72165
Reverted previous wrong patch, throw warning for numeric keys.
Numeric field names are not supported, see "distinguished name"
section here https://www.openssl.org/docs/manmaster/apps/req.html
Anatol Belski [Fri, 6 May 2016 07:19:04 +0000 (09:19 +0200)]
Revert "Fixed bug #72165 Null pointer dereference - openssl_csr_new"
This reverts commit
7277c85765d1053c8cd1d1093902df541b3d101a .
Anatol Belski [Fri, 6 May 2016 07:02:14 +0000 (09:02 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #72165 Null pointer dereference - openssl_csr_new
Anatol Belski [Fri, 6 May 2016 07:00:58 +0000 (09:00 +0200)]
Fixed bug #72165 Null pointer dereference - openssl_csr_new
Xinchen Hui [Fri, 6 May 2016 02:53:25 +0000 (10:53 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed test
Revert "Fix bug #72162 (again)"
Xinchen Hui [Fri, 6 May 2016 02:51:38 +0000 (10:51 +0800)]
Fixed test
Xinchen Hui [Fri, 6 May 2016 02:45:44 +0000 (10:45 +0800)]
Revert "Fix bug #72162 (again)"
The problem is because we release p->value too early
and later you try to convert an object to string, which is a fatal error
then leave p->value double free, change to expect long is a BC break
This reverts commit
8e5b38100411d3b8fa4486c7c41dec7dedb4b474 .
Bob Weinand [Thu, 5 May 2016 21:31:57 +0000 (23:31 +0200)]
Refactor zval cleanup into single function
Also use zval_ptr_dtor_nogc() everywhere in Zend in favor of zval_dtor()
Nikita Popov [Thu, 5 May 2016 15:31:25 +0000 (17:31 +0200)]
Merge branch 'PHP-7.0'
Conflicts:
Zend/zend_builtin_functions.c
Nikita Popov [Thu, 5 May 2016 15:28:52 +0000 (17:28 +0200)]
Fix bug #72162 (again)
Not sure what the previous fix was supposed to do. The issue was
that error_reporting() simply assumes that the value must either
be an integer or a string.
Fixed by using zpp properly.
Dmitry Stogov [Thu, 5 May 2016 13:19:59 +0000 (16:19 +0300)]
Micro-optimization
Dmitry Stogov [Thu, 5 May 2016 11:41:34 +0000 (14:41 +0300)]
Update comments consistently (#var0 -> #v)
Dmitry Stogov [Thu, 5 May 2016 11:37:41 +0000 (14:37 +0300)]
Refactor DFA pass for better readability
Xinchen Hui [Thu, 5 May 2016 09:27:58 +0000 (17:27 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #72164 (Null Pointer Dereference - mb_ereg_replace)