]>
granicus.if.org Git - php/log
Rasmus Lerdorf [Tue, 22 Mar 2016 15:04:53 +0000 (08:04 -0700)]
Disable huge pages in the Zend allocator by default
As per the discussion on internals, this is an expert feature
that needs special system-level configuration and care.
Xinchen Hui [Tue, 22 Mar 2016 03:28:19 +0000 (11:28 +0800)]
Update test script
Nikita Popov [Mon, 21 Mar 2016 21:49:18 +0000 (22:49 +0100)]
Fixed bug #71871
Anatol Belski [Mon, 21 Mar 2016 17:59:39 +0000 (18:59 +0100)]
decrease the default PCRE JIT stack to 64K
Anatol Belski [Mon, 21 Mar 2016 16:15:44 +0000 (17:15 +0100)]
Increase PCRE JIT stack size
It is done by implementing the custom stack usage. This makes the
JIT with mode on more compatible with the JIT mode off. Until now, the
default PCRE JIT stack was used which is 32kb big by default. There
are situations where some patterns would fail with JIT while working
correctly without JIT.
The starting size of the JIT stack is still set to 32kb, while the
max is set to the permissive 256kb (and can be increased up to 1mb).
As until now no suchlike bugs regarding JIT were reported, it is expected,
that the stack usage will stay by 32kb in most cases. Though providing
the custom stack, applications will have more room for some sporadic
stack increase, thus more compatibility.
Julien Pauli [Mon, 21 Mar 2016 14:40:01 +0000 (15:40 +0100)]
Updated NEWS
Julien Pauli [Mon, 21 Mar 2016 14:32:52 +0000 (15:32 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Updated NEWS
Reworked Fix bug #52098
Fix bug #52098
Conflicts:
ext/pdo/pdo_dbh.c
ext/pdo/pdo_stmt.c
Julien Pauli [Mon, 21 Mar 2016 14:26:21 +0000 (15:26 +0100)]
Updated NEWS
Julien Pauli [Mon, 21 Mar 2016 14:23:18 +0000 (15:23 +0100)]
Reworked Fix bug #52098
Daniel Persson [Sat, 26 Sep 2015 10:43:40 +0000 (12:43 +0200)]
Fix bug #52098
Xinchen Hui [Mon, 21 Mar 2016 11:19:05 +0000 (19:19 +0800)]
array_dup should not copy the nApplyCount
Xinchen Hui [Mon, 21 Mar 2016 11:12:50 +0000 (19:12 +0800)]
Also protects object to array cast
Xinchen Hui [Mon, 21 Mar 2016 08:44:30 +0000 (16:44 +0800)]
Update NEWS
Xinchen Hui [Mon, 21 Mar 2016 08:43:55 +0000 (16:43 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Update NEWS for
efacdc3
FIX #71831: CURLOPT_NOPROXY applied as long instead of string
Xinchen Hui [Mon, 21 Mar 2016 08:43:30 +0000 (16:43 +0800)]
Xinchen Hui [Mon, 21 Mar 2016 08:39:22 +0000 (16:39 +0800)]
Merge branch 'PHP-5.6' of https://github.com/msierks/php-src into PHP-5.6
* 'PHP-5.6' of https://github.com/msierks/php-src:
FIX #71831: CURLOPT_NOPROXY applied as long instead of string
Xinchen Hui [Mon, 21 Mar 2016 08:03:16 +0000 (16:03 +0800)]
Merge branch 'bug71835' of https://github.com/bukka/php-src into PHP-7.0
* 'bug71835' of https://github.com/bukka/php-src:
Fix bug #71835 (json_encode sometimes incorrectly detects recursion with JsonSerializable)
Stanislav Malyshev [Mon, 21 Mar 2016 05:39:17 +0000 (22:39 -0700)]
Fix bug #71750: use zend_string_safe_alloc for calculated allocations
Stanislav Malyshev [Mon, 21 Mar 2016 05:29:08 +0000 (22:29 -0700)]
Fix bug #71735: Double-free in SplDoublyLinkedList::offsetSet
Nikita Popov [Sun, 20 Mar 2016 17:17:44 +0000 (18:17 +0100)]
Fixed bug #62059
Nikita Popov [Sun, 20 Mar 2016 16:48:06 +0000 (17:48 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
ext/spl/spl_observer.c
Nikita Popov [Sun, 20 Mar 2016 16:46:12 +0000 (17:46 +0100)]
Fixed bug #67582
Jakub Zelenka [Sun, 20 Mar 2016 15:53:57 +0000 (15:53 +0000)]
Fix bug #71835 (json_encode sometimes incorrectly detects recursion with JsonSerializable)
Nikita Popov [Sun, 20 Mar 2016 12:33:00 +0000 (13:33 +0100)]
Fixed bug #71731
The read_dimension() handler in BP_VAR_IS mode will now call
offsetExists() before caling offsetGet(). This has always been a
problem, however recently the issue has been exacerbated, because
the null-coalesce operator ?? makes it visible for non-nested
array accesses.
Also fixes #69659.
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
Michael Sierks [Fri, 18 Mar 2016 12:29:01 +0000 (07:29 -0500)]
FIX #71831: CURLOPT_NOPROXY applied as long instead of string
The CURLOPT_NOPROXY option value is converted to a long before
being applied as a curl option. This causes the option to have
no effect. This patch changes this conversion to a string.
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