]>
granicus.if.org Git - php/log
Nikita Popov [Sun, 20 Mar 2016 11:58:58 +0000 (12:58 +0100)]
Fix use of UNDEF instead of NULL in read_dimension
Xinchen Hui [Sun, 20 Mar 2016 11:52:57 +0000 (04:52 -0700)]
Fixed Bug #71859 (zend_objects_store_call_destructors operates on realloced memory, crashing)
Nikita Popov [Fri, 18 Mar 2016 19:26:24 +0000 (20:26 +0100)]
Fixed bug #52339
Autoloader 101: Don't throw if you fail. PHP will throw for you.
Nikita Popov [Fri, 18 Mar 2016 18:59:08 +0000 (19:59 +0100)]
Add extra ArrayObject::sort() test
Nikita Popov [Fri, 18 Mar 2016 18:58:52 +0000 (19:58 +0100)]
Fix bug #71838
Nikita Popov [Fri, 18 Mar 2016 18:30:29 +0000 (19:30 +0100)]
Fix ZEND_DEBUG condition
Dmitry Stogov [Fri, 18 Mar 2016 07:27:46 +0000 (10:27 +0300)]
typo
Dmitry Stogov [Fri, 18 Mar 2016 07:25:48 +0000 (10:25 +0300)]
typo
Xinchen Hui [Fri, 18 Mar 2016 03:50:03 +0000 (11:50 +0800)]
Fixed pdo_stmt.c: zval* being passed into zend_parse_parameters_ex
Dmitry Stogov [Thu, 17 Mar 2016 19:43:42 +0000 (22:43 +0300)]
Added ability to disable huge pages in Zend Memeory Manager through the environment variable USE_ZEND_ALLOC_HUGE_PAGES=0.
Anatol Belski [Thu, 17 Mar 2016 18:04:56 +0000 (19:04 +0100)]
fix and update NEWS
Anatol Belski [Thu, 17 Mar 2016 18:03:46 +0000 (19:03 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix and update NEWS
Anatol Belski [Thu, 17 Mar 2016 18:02:08 +0000 (19:02 +0100)]
fix and update NEWS
Xinchen Hui [Thu, 17 Mar 2016 14:57:22 +0000 (07:57 -0700)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
Anatol Belski [Thu, 17 Mar 2016 14:55:37 +0000 (15:55 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Backport patch for bug #71820
Xinchen Hui [Thu, 17 Mar 2016 14:55:25 +0000 (07:55 -0700)]
Fixed test & ZEND_BOOL should result TMP_VAR
Xinchen Hui [Thu, 17 Mar 2016 14:41:41 +0000 (07:41 -0700)]
Fixed #71837 (Wrong arrays behaviour)
Anatol Belski [Thu, 17 Mar 2016 13:28:32 +0000 (14:28 +0100)]
Xinchen Hui [Thu, 17 Mar 2016 13:27:23 +0000 (21:27 +0800)]
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:/php-src:
fix NEWS
NEWS
Fix Bug #63171 Script hangs after max_execution_time
Xinchen Hui [Thu, 17 Mar 2016 13:26:14 +0000 (21:26 +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 NEWS
NEWS
NEWS
Fix Bug #63171 Script hangs after max_execution_time
Fixed bug #71820 pg_fetch_object bind parameters before call constructor
Xinchen Hui [Thu, 17 Mar 2016 13:10:08 +0000 (21:10 +0800)]
Fixed for master
Remi Collet [Thu, 17 Mar 2016 12:53:52 +0000 (13:53 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix NEWS
Remi Collet [Thu, 17 Mar 2016 12:53:42 +0000 (13:53 +0100)]
fix NEWS
Remi Collet [Thu, 17 Mar 2016 12:44:28 +0000 (13:44 +0100)]
NEWS
Remi Collet [Thu, 17 Mar 2016 12:42:34 +0000 (13:42 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
NEWS
Fix Bug #63171 Script hangs after max_execution_time
Remi Collet [Thu, 17 Mar 2016 12:40:42 +0000 (13:40 +0100)]
NEWS
Remi Collet [Thu, 17 Mar 2016 12:38:45 +0000 (13:38 +0100)]
Fix Bug #63171 Script hangs after max_execution_time
If aborted via timer expiration, don't try to call any unixODBC function
which may hangs because of internal locks
Xinchen Hui [Thu, 17 Mar 2016 12:21:36 +0000 (20:21 +0800)]
Remove unnecessary pattern
Xinchen Hui [Thu, 17 Mar 2016 12:20:01 +0000 (20:20 +0800)]
Fixed for PHP7
Xinchen Hui [Thu, 17 Mar 2016 11:54:33 +0000 (19:54 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed bug #71843 (null ptr deref ZEND_RETURN_SPEC_CONST_HANDLER)
Xinchen Hui [Thu, 17 Mar 2016 11:06:50 +0000 (19:06 +0800)]
Fixed bug #71843 (null ptr deref ZEND_RETURN_SPEC_CONST_HANDLER)
Anatol Belski [Thu, 17 Mar 2016 11:39:31 +0000 (12:39 +0100)]
Fixed bug #71820 pg_fetch_object bind parameters before call constructor
If we want to fetch into an object of a custom class that implemens
__set handler, the corstructor has to be called first. The data
passed to the constructor can be possibly required in __set handler.
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:36 +0000 (15:27 +0800)]
Remove typo
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)
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:54:56 +0000 (10:54 +0100)]
More email fixing
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: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
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: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:24:41 +0000 (08:24 +0100)]
prepare next
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
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: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: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:38 +0000 (22:45 +0100)]
Fixed bug #71806
Grigorii Sokolik [Fri, 11 Mar 2016 16:28:45 +0000 (19:28 +0300)]
Fix bug #71767
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: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
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: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:33:36 +0000 (13:33 +0300)]
More effecient fix for bug #71756
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:24:33 +0000 (08:24 +0100)]
fix invalid pointer on 64-bit
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: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:02:10 +0000 (15:02 +0800)]
Fixed bug #71754 (Regression in PHP7.0: trivial script segfaults php-cgi)
Xinchen Hui [Thu, 10 Mar 2016 06:58:10 +0000 (14:58 +0800)]
Bug #71756 (Call-by-reference widens scope to uninvolved functions when used in switch)
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)
Nikita Popov [Wed, 9 Mar 2016 21:58:57 +0000 (22:58 +0100)]
Fix bug #71659
Anatol Belski [Wed, 9 Mar 2016 13:28:38 +0000 (14:28 +0100)]
fix SKIPIF sections
Anatol Belski [Wed, 9 Mar 2016 13:17:30 +0000 (14:17 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix directory separator
Anatol Belski [Wed, 9 Mar 2016 13:16:29 +0000 (14:16 +0100)]
fix directory separator
Xinchen Hui [Wed, 9 Mar 2016 04:16:24 +0000 (12:16 +0800)]
Fixed bug #71729 (Possible crash in zend_bin_strtod, zend_oct_strtod, zend_hex_strtod)
Anatol Belski [Tue, 8 Mar 2016 12:16:08 +0000 (13:16 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix regression introduced in
5683b6fa39
Anatol Belski [Tue, 8 Mar 2016 11:59:59 +0000 (12:59 +0100)]
fix regression introduced in
5683b6fa39
Test extended. Basically, both iterator type and next node have
to be checked.
Anatol Belski [Mon, 7 Mar 2016 21:01:44 +0000 (22:01 +0100)]
fix incompatible pointers on 64-bit
Anatol Belski [Mon, 7 Mar 2016 15:38:47 +0000 (16:38 +0100)]
fix double free and move temps into local scope
Anatol Belski [Mon, 7 Mar 2016 15:26:01 +0000 (16:26 +0100)]
add error check
Nikita Popov [Sun, 6 Mar 2016 20:38:21 +0000 (21:38 +0100)]
Fixed bug #71724
Anatol Belski [Fri, 4 Mar 2016 11:26:25 +0000 (12:26 +0100)]
fix ibase connection routine
followup on
a7028d96
Tjerk Meesters [Thu, 3 Mar 2016 22:48:45 +0000 (23:48 +0100)]
Fix one zpp usage in interbase
Also small tweak to zpp REAME