d26ca89402
array_dup should not copy the nApplyCount
2016-03-21 19:19:05 +08:00
9712a974be
Also protects object to array cast
2016-03-21 19:12:50 +08:00
a9a46f17be
Update NEWS
2016-03-21 16:44:30 +08:00
ead0dfc3c9
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Update NEWS for efacdc3FIX #71831 : CURLOPT_NOPROXY applied as long instead of string
2016-03-21 16:43:55 +08:00
c9c8e70463
Update NEWS for efacdc3
2016-03-21 16:43:30 +08:00
056459dc9d
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
2016-03-21 16:39:22 +08:00
65ae7440b0
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)
2016-03-21 16:03:16 +08:00
c4517b2a5e
Fix bug #71750 : use zend_string_safe_alloc for calculated allocations
2016-03-20 22:39:17 -07:00
28a6ed9f9a
Fix bug #71735 : Double-free in SplDoublyLinkedList::offsetSet
2016-03-20 22:29:08 -07:00
f3309173f9
Fixed bug #62059
2016-03-20 18:17:44 +01:00
12f2665df8
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
ext/spl/spl_observer.c
2016-03-20 17:48:06 +01:00
cc3cdd0057
Fixed bug #67582
2016-03-20 17:46:12 +01:00
7e069daa89
Fix bug #71835 (json_encode sometimes incorrectly detects recursion with JsonSerializable)
2016-03-20 15:56:27 +00:00
a175aa9dca
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 .
2016-03-20 13:35:00 +01:00
1f6d27d3d2
Fix use of UNDEF instead of NULL in read_dimension
2016-03-20 13:33:17 +01:00
9564998e49
Fixed Bug #71859 (zend_objects_store_call_destructors operates on realloced memory, crashing)
2016-03-20 04:52:57 -07:00
8023204d21
Fixed bug #52339
...
Autoloader 101: Don't throw if you fail. PHP will throw for you.
2016-03-18 20:28:58 +01:00
a2522efa9f
Add extra ArrayObject::sort() test
2016-03-18 19:59:08 +01:00
094c808374
Fix bug #71838
2016-03-18 19:58:52 +01:00
fd95555107
Fix ZEND_DEBUG condition
2016-03-18 19:31:34 +01:00
efacdc3511
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.
2016-03-18 07:29:01 -05:00
69c9be5c99
typo
2016-03-18 10:27:46 +03:00
11594e86b8
typo
2016-03-18 10:25:48 +03:00
5b8d0dc6ae
Fixed pdo_stmt.c: zval* being passed into zend_parse_parameters_ex
2016-03-18 11:50:03 +08:00
945a661912
Added ability to disable huge pages in Zend Memeory Manager through the environment variable USE_ZEND_ALLOC_HUGE_PAGES=0.
2016-03-17 22:43:42 +03:00
28b6f0232b
fix and update NEWS
2016-03-17 19:04:56 +01:00
d529c3358c
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix and update NEWS
2016-03-17 19:03:46 +01:00
b8c9c92d44
fix and update NEWS
2016-03-17 19:02:08 +01:00
a2ca4558b5
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
2016-03-17 07:57:22 -07:00
ef8d6435a2
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Backport patch for bug #71820
2016-03-17 15:55:37 +01:00
93499bfd8a
Fixed test & ZEND_BOOL should result TMP_VAR
2016-03-17 07:55:25 -07:00
345ecd9822
Fixed #71837 (Wrong arrays behaviour)
2016-03-17 07:41:41 -07:00
1b632cfe83
Backport patch for bug #71820
...
Rev b4eedd128b
2016-03-17 14:28:58 +01:00
eb405623ec
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
2016-03-17 21:27:23 +08:00
383dde5b15
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
2016-03-17 21:26:14 +08:00
910e6dc6b8
Fixed for master
2016-03-17 21:10:08 +08:00
e7f74a3f9b
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix NEWS
2016-03-17 13:53:52 +01:00
b5b1ba850a
fix NEWS
2016-03-17 13:53:42 +01:00
9073208f6c
NEWS
2016-03-17 13:44:28 +01:00
2291ebc0ea
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
NEWS
Fix Bug #63171 Script hangs after max_execution_time
2016-03-17 13:42:34 +01:00
d513b4cde5
NEWS
2016-03-17 13:40:42 +01:00
407ad28ae5
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
2016-03-17 13:38:45 +01:00
aef22ac1c1
Remove unnecessary pattern
2016-03-17 20:21:36 +08:00
041a01fd6c
Fixed for PHP7
2016-03-17 20:20:01 +08:00
820b0aa2ab
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed bug #71843 (null ptr deref ZEND_RETURN_SPEC_CONST_HANDLER)
2016-03-17 19:54:33 +08:00
8e2f658f49
Fixed bug #71843 (null ptr deref ZEND_RETURN_SPEC_CONST_HANDLER)
2016-03-17 19:54:19 +08:00
b4eedd128b
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.
2016-03-17 12:41:55 +01:00
dae086040e
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed test script
2016-03-17 17:07:07 +08:00
6d4aec029a
Fixed test script
2016-03-17 17:06:56 +08:00
e12456603a
Remove typo
2016-03-17 15:27:36 +08:00
Xinchen Hui