]>
granicus.if.org Git - php/log
Xinchen Hui [Thu, 17 Mar 2016 09:07:14 +0000 (17:07 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed test script
Xinchen Hui [Thu, 17 Mar 2016 09:07:07 +0000 (17:07 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed test script
Xinchen Hui [Thu, 17 Mar 2016 09:06:56 +0000 (17:06 +0800)]
Fixed test script
Xinchen Hui [Thu, 17 Mar 2016 07:27:56 +0000 (15:27 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Remove typo
Xinchen Hui [Thu, 17 Mar 2016 07:27:36 +0000 (15:27 +0800)]
Remove typo
Xinchen Hui [Thu, 17 Mar 2016 07:26:56 +0000 (15:26 +0800)]
Unnecessary anymore
Xinchen Hui [Thu, 17 Mar 2016 07:26:40 +0000 (15:26 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed test script
Update NEWS
Fixed bug #71841 (EG(error_zval) is not handled well)
Fixed bug #71840 (Unserialize accepts wrongly data)
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Xinchen Hui [Thu, 17 Mar 2016 07:23:53 +0000 (15:23 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed test script
Xinchen Hui [Thu, 17 Mar 2016 07:23:44 +0000 (15:23 +0800)]
Fixed test script
Xinchen Hui [Thu, 17 Mar 2016 07:23:21 +0000 (15:23 +0800)]
Update NEWS
Xinchen Hui [Thu, 17 Mar 2016 07:22:44 +0000 (15:22 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed bug #71841 (EG(error_zval) is not handled well)
Fixed bug #71840 (Unserialize accepts wrongly data)
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/standard/var_unserializer.c
Xinchen Hui [Thu, 17 Mar 2016 07:16:47 +0000 (15:16 +0800)]
Fixed bug #71841 (EG(error_zval) is not handled well)
Xinchen Hui [Thu, 17 Mar 2016 06:27:27 +0000 (14:27 +0800)]
Fixed bug #71840 (Unserialize accepts wrongly data)
Dmitry Stogov [Thu, 17 Mar 2016 06:58:15 +0000 (09:58 +0300)]
Change LONG constants into DOUBLE, if they are going to be used as DOUBLE.
Xinchen Hui [Thu, 17 Mar 2016 03:59:15 +0000 (11:59 +0800)]
Sorry for that... Merged by accident....
Revert "Transparently introduce type-specialized opcode handlers."
This reverts commit
59d00b8bcc05f72b29c3c768542b2bb6e69e1af4 .
Xinchen Hui [Thu, 17 Mar 2016 03:58:59 +0000 (11:58 +0800)]
Revert "Taking into account "undefined" variables"
This reverts commit
9020086a13c506ec127a648d08e9a30a81f08883 .
Xinchen Hui [Thu, 17 Mar 2016 03:57:08 +0000 (11:57 +0800)]
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Fix build
Fix build
Fix build
prepare for 5.6.20RC1
Fix more emails
More email fixing
Fix emails in headers. @mysql.com addresses are no more since many years.
fix #ifdef usage
Xinchen Hui [Thu, 17 Mar 2016 03:56:32 +0000 (11:56 +0800)]
Fixed Bug #71824 (null ptr deref _zval_get_string_func (zend_operators.c:851))
Kalle Sommer Nielsen [Thu, 17 Mar 2016 02:53:01 +0000 (03:53 +0100)]
Fix build
Kalle Sommer Nielsen [Thu, 17 Mar 2016 02:45:04 +0000 (03:45 +0100)]
Fix build
Kalle Sommer Nielsen [Thu, 17 Mar 2016 02:41:36 +0000 (03:41 +0100)]
Fix build
Ferenc Kovacs [Thu, 17 Mar 2016 00:48:16 +0000 (01:48 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
prepare for 5.6.20RC1
Ferenc Kovacs [Thu, 17 Mar 2016 00:47:37 +0000 (01:47 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
prepare for 5.6.20RC1
Ferenc Kovacs [Thu, 17 Mar 2016 00:46:00 +0000 (01:46 +0100)]
prepare for 5.6.20RC1
Andrey Hristov [Wed, 16 Mar 2016 09:57:12 +0000 (10:57 +0100)]
Fix more emails
Andrey Hristov [Wed, 16 Mar 2016 09:55:09 +0000 (10:55 +0100)]
Merge branch 'PHP-7.0'
Andrey Hristov [Wed, 16 Mar 2016 09:54:56 +0000 (10:54 +0100)]
More email fixing
Andrey Hristov [Wed, 16 Mar 2016 09:47:27 +0000 (10:47 +0100)]
Merge branch 'PHP-7.0'
Andrey Hristov [Wed, 16 Mar 2016 09:24:52 +0000 (10:24 +0100)]
Fix emails in headers. @mysql.com addresses are no more since many years.
Remi Collet [Wed, 16 Mar 2016 06:18:23 +0000 (07:18 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix #ifdef usage
Remi Collet [Wed, 16 Mar 2016 06:18:09 +0000 (07:18 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix #ifdef usage
Remi Collet [Wed, 16 Mar 2016 06:17:49 +0000 (07:17 +0100)]
fix #ifdef usage
Dmitry Stogov [Wed, 16 Mar 2016 01:20:43 +0000 (04:20 +0300)]
Taking into account "undefined" variables
Dmitry Stogov [Wed, 16 Mar 2016 00:36:58 +0000 (03:36 +0300)]
Transparently introduce type-specialized opcode handlers.
This affects only PHP VM, and doesn't change anything else.
Dmitry Stogov [Tue, 15 Mar 2016 19:19:01 +0000 (22:19 +0300)]
Convert LONG constants to DOUBLE, when later they are going to be used as DOUBLE
Derick Rethans [Tue, 15 Mar 2016 09:14:12 +0000 (09:14 +0000)]
Updated to version 2016.2 (2016b)
Derick Rethans [Tue, 15 Mar 2016 09:14:12 +0000 (09:14 +0000)]
Empty merge
Derick Rethans [Tue, 15 Mar 2016 09:14:11 +0000 (09:14 +0000)]
Updated to version 2016.2 (2016b)
Derick Rethans [Tue, 15 Mar 2016 09:14:10 +0000 (09:14 +0000)]
Empty merge
Derick Rethans [Tue, 15 Mar 2016 09:14:09 +0000 (09:14 +0000)]
Updated to version 2016.2 (2016b)
Anatol Belski [Tue, 15 Mar 2016 08:44:48 +0000 (09:44 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update libs versions
update libs versions
Anatol Belski [Tue, 15 Mar 2016 08:44:05 +0000 (09:44 +0100)]
update libs versions
Anatol Belski [Tue, 15 Mar 2016 08:43:08 +0000 (09:43 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update libs versions
Anatol Belski [Tue, 15 Mar 2016 08:41:34 +0000 (09:41 +0100)]
update libs versions
Anatol Belski [Tue, 15 Mar 2016 07:26:12 +0000 (08:26 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
prepare next
Anatol Belski [Tue, 15 Mar 2016 07:24:41 +0000 (08:24 +0100)]
prepare next
Anatol Belski [Tue, 15 Mar 2016 06:11:54 +0000 (07:11 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
Fix bug #71624, PHP_MODE_PROCESS_STDIN (CLI SAPI called with '-R') did not properly set $argi and $argn
fix uninitialized value
Anatol Belski [Tue, 15 Mar 2016 06:11:21 +0000 (07:11 +0100)]
update NEWS
Sean DuBois [Sun, 13 Mar 2016 03:15:54 +0000 (21:15 -0600)]
Fix bug #71624, PHP_MODE_PROCESS_STDIN (CLI SAPI called with '-R') did not properly set $argi and $argn
Anatol Belski [Tue, 15 Mar 2016 05:43:29 +0000 (06:43 +0100)]
fix uninitialized value
Nikita Popov [Wed, 2 Mar 2016 12:21:20 +0000 (13:21 +0100)]
Mark uses in UNSET_VAR op1 + FE_FETCH_R op2 as no_val
Nikita Popov [Sun, 13 Mar 2016 17:01:51 +0000 (18:01 +0100)]
Statically bind static method call arguments
If we know what method will be called, use ct-bound send opcodes.
The intl test is changed because a runtime error changed to a
compile-time error.
Anatol Belski [Mon, 14 Mar 2016 15:45:12 +0000 (16:45 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix pointer truncation on 64 bit
Anatol Belski [Mon, 14 Mar 2016 15:44:27 +0000 (16:44 +0100)]
fix pointer truncation on 64 bit
Anatol Belski [Mon, 14 Mar 2016 14:58:40 +0000 (15:58 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix test
Update NEWS
Anatol Belski [Mon, 14 Mar 2016 14:58:05 +0000 (15:58 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix test
Anatol Belski [Mon, 14 Mar 2016 14:53:02 +0000 (15:53 +0100)]
fix test
Many warnings won't appear with libxml2 >= 2.9.3 because in many
cases libxml2 2.9.3 will just abort processing.
Yasuo Ohgaki [Fri, 11 Mar 2016 23:52:16 +0000 (08:52 +0900)]
Update NEWS
Fixed Bug #71754 Regression in PHP7.0: trivial script segfaults php-cgi
Fixed Bug #71683 Null pointer dereference in zend_hash_str_find_bucket
Fixed Bug #71599 trans sid handling rework broke interaction with cookies
All of these bugs are caused by git global change in PHP-7.0.
Yasuo Ohgaki [Fri, 11 Mar 2016 23:39:51 +0000 (08:39 +0900)]
Fixed Bug #71754 Regression in PHP7.0: trivial script segfaults php-cgi
Fixed Bug #71683 Null pointer dereference in zend_hash_str_find_bucket
Fixed Bug #71599 trans sid handling rework broke interaction with cookies
All of these bug is caused by git global change in PHP-7.0.
Yasuo Ohgaki [Fri, 11 Mar 2016 23:33:04 +0000 (08:33 +0900)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed Bug #71683 Null pointer dereference in zend_hash_str_find_bucket
Yasuo Ohgaki [Fri, 11 Mar 2016 23:15:47 +0000 (08:15 +0900)]
Fixed Bug #71683 Null pointer dereference in zend_hash_str_find_bucket
Nikita Popov [Fri, 11 Mar 2016 21:45:52 +0000 (22:45 +0100)]
Merge branch 'PHP-7.0'
Nikita Popov [Fri, 11 Mar 2016 21:45:38 +0000 (22:45 +0100)]
Fixed bug #71806
Nikita Popov [Fri, 11 Mar 2016 21:28:50 +0000 (22:28 +0100)]
Merge branch 'PHP-7.0'
Grigorii Sokolik [Fri, 11 Mar 2016 16:28:45 +0000 (19:28 +0300)]
Fix bug #71767
Dmitry Stogov [Fri, 11 Mar 2016 13:51:06 +0000 (16:51 +0300)]
Added ability to avoid code generation for useless opcode handlers.
- SPEC(NO_CONST_CONST) may prevent codegeneration for handlers like ADD_SPEC_CONST_CONST. Compiler and optimizaer should care about constants folding.
- SPEC(COMMUTATIVE) generate only single handler instead of two eqivalents like ADD_SPEC_CONST_CV and ADD_SPEC_CV_CONST. Compiler and optimizer should care avout operands swapping.
Anatol Belski [Fri, 11 Mar 2016 13:24:03 +0000 (14:24 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
update NEWS
Anatol Belski [Fri, 11 Mar 2016 13:23:34 +0000 (14:23 +0100)]
update NEWS
Anatol Belski [Fri, 11 Mar 2016 13:23:07 +0000 (14:23 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update NEWS
Anatol Belski [Fri, 11 Mar 2016 13:22:11 +0000 (14:22 +0100)]
update NEWS
Anatol Belski [Fri, 11 Mar 2016 13:13:11 +0000 (14:13 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fix DatePeriod::getEndDate() segfault
Anatol Belski [Fri, 11 Mar 2016 13:12:54 +0000 (14:12 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix DatePeriod::getEndDate() segfault
Thomas Punt [Mon, 7 Mar 2016 09:40:22 +0000 (09:40 +0000)]
Fix DatePeriod::getEndDate() segfault
Dmitry Stogov [Fri, 11 Mar 2016 10:38:53 +0000 (13:38 +0300)]
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
Dmitry Stogov [Fri, 11 Mar 2016 09:17:03 +0000 (12:17 +0300)]
Added possibility for extra specialization for SMART_BRANCH (e.g. IS_EQUAL+JMPZ superinstruction).
Anatol Belski [Thu, 10 Mar 2016 16:11:42 +0000 (17:11 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix build with clang on Winodws
Dmitry Stogov [Thu, 10 Mar 2016 15:31:02 +0000 (18:31 +0300)]
Remove NOPs after DFA pass.
Anatol Belski [Thu, 10 Mar 2016 14:30:20 +0000 (15:30 +0100)]
fix build with clang on Winodws
Anatol Belski [Thu, 10 Mar 2016 10:40:08 +0000 (11:40 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix error condition, part of bug #71753
Anatol Belski [Thu, 10 Mar 2016 10:39:16 +0000 (11:39 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix error condition, part of bug #71753
Anatol Belski [Thu, 10 Mar 2016 10:35:50 +0000 (11:35 +0100)]
fix error condition, part of bug #71753
Dmitry Stogov [Thu, 10 Mar 2016 10:34:41 +0000 (13:34 +0300)]
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:php-src:
tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)
Dmitry Stogov [Thu, 10 Mar 2016 10:34:25 +0000 (13:34 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)
Dmitry Stogov [Thu, 10 Mar 2016 10:34:00 +0000 (13:34 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
More effecient fix for bug #71756
Dmitry Stogov [Thu, 10 Mar 2016 10:33:36 +0000 (13:33 +0300)]
More effecient fix for bug #71756
Anatol Belski [Thu, 10 Mar 2016 08:36:32 +0000 (09:36 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)
Anatol Belski [Thu, 10 Mar 2016 08:35:55 +0000 (09:35 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)
Xinchen Hui [Thu, 10 Mar 2016 06:24:13 +0000 (14:24 +0800)]
tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)
cherry-picked from
7d5f71b0b125c89211e5a2a6d925deba938abd41
Anatol Belski [Thu, 10 Mar 2016 07:45:57 +0000 (08:45 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix invalid pointer on 64-bit
Anatol Belski [Thu, 10 Mar 2016 07:24:33 +0000 (08:24 +0100)]
fix invalid pointer on 64-bit
Anatol Belski [Thu, 10 Mar 2016 07:24:33 +0000 (08:24 +0100)]
fix invalid pointer on 64-bit
Xinchen Hui [Thu, 10 Mar 2016 07:43:53 +0000 (15:43 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Useless check (part of #71753)
object->ce should not be NULL
Fixed typo (partially fix for #71753)
emalloc never returns NULL (partially fix for #71753)
Xinchen Hui [Thu, 10 Mar 2016 07:43:22 +0000 (15:43 +0800)]
Useless check (part of #71753)
Xinchen Hui [Thu, 10 Mar 2016 07:26:15 +0000 (15:26 +0800)]
object->ce should not be NULL
Xinchen Hui [Thu, 10 Mar 2016 07:23:40 +0000 (15:23 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed typo (partially fix for #71753)
Conflicts:
ext/standard/uuencode.c
Xinchen Hui [Thu, 10 Mar 2016 07:22:34 +0000 (15:22 +0800)]
Fixed typo (partially fix for #71753)
Xinchen Hui [Thu, 10 Mar 2016 07:15:26 +0000 (15:15 +0800)]
emalloc never returns NULL (partially fix for #71753)
Xinchen Hui [Thu, 10 Mar 2016 07:10:26 +0000 (15:10 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Improve the codes (FETCH_DIM_R/IS is read context, we should not expose IS_REFERENCE)
Xinchen Hui [Thu, 10 Mar 2016 07:09:51 +0000 (15:09 +0800)]
Improve the codes (FETCH_DIM_R/IS is read context, we should not expose IS_REFERENCE)
Xinchen Hui [Thu, 10 Mar 2016 07:03:25 +0000 (15:03 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #71754 (Regression in PHP7.0: trivial script segfaults php-cgi)
Bug #71756 (Call-by-reference widens scope to uninvolved functions when used in switch)
tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)