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
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
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
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
5b8d0dc6ae
Fixed pdo_stmt.c: zval* being passed into zend_parse_parameters_ex
2016-03-18 11:50:03 +08: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
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
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
b8f0cb063f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed test script
2016-03-17 15:23:53 +08:00
ead7632cf9
Fixed test script
2016-03-17 15:23:44 +08:00
fe1a3fc08b
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
2016-03-17 15:22:44 +08:00
6f241f5fad
Fixed bug #71840 (Unserialize accepts wrongly data)
2016-03-17 15:15:28 +08:00
fa4addd409
More email fixing
2016-03-16 10:54:56 +01:00
f2ab731a8c
Fix emails in headers. @mysql.com addresses are no more since many years.
2016-03-16 10:24:52 +01:00
46293ed6d4
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix #ifdef usage
2016-03-16 07:18:09 +01:00
478c807128
fix #ifdef usage
2016-03-16 07:17:49 +01:00
ba71144b8c
Updated to version 2016.2 (2016b)
2016-03-15 09:14:11 +00:00
ddc62f2e8b
Updated to version 2016.2 (2016b)
2016-03-15 09:14:09 +00:00
84651b32eb
fix uninitialized value
2016-03-15 06:43:29 +01:00
704a9aeea7
fix pointer truncation on 64 bit
2016-03-14 16:44:27 +01:00
ab7764d99b
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix test
2016-03-14 15:58:05 +01:00
beda05269c
fix test
...
Many warnings won't appear with libxml2 >= 2.9.3 because in many
cases libxml2 2.9.3 will just abort processing.
2016-03-14 15:53:02 +01:00
ca61f5954b
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.
2016-03-12 08:40:37 +09:00
50fca7a02a
Fixed Bug #71683 Null pointer dereference in zend_hash_str_find_bucket
2016-03-12 08:15:47 +09:00
02743f43c2
Fixed bug #71806
2016-03-11 22:45:38 +01:00
ccc5150f15
Fix bug #71767
2016-03-11 22:27:48 +01:00
d26d80ab75
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix DatePeriod::getEndDate() segfault
2016-03-11 14:12:54 +01:00
f3f5a07aa5
Fix DatePeriod::getEndDate() segfault
2016-03-11 14:08:48 +01:00
8b5d09a195
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix error condition, part of bug #71753
2016-03-10 11:39:16 +01:00
Xinchen Hui