3f3180e35f
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Update test script
2016-03-22 11:28:45 +08:00
b49ec68134
Update test script
2016-03-22 11:28:19 +08:00
ac3a66cfad
Merge branch 'PHP-7.0'
2016-03-21 22:50:03 +01:00
dc842bbf8d
Fixed bug #71871
2016-03-21 22:49:18 +01:00
925adbb143
Merge branch 'PHP-7.0'
...
* PHP-7.0:
decrease the default PCRE JIT stack to 64K
2016-03-21 19:00:10 +01:00
e988239634
decrease the default PCRE JIT stack to 64K
2016-03-21 18:59:39 +01:00
9e521485b5
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Increase PCRE JIT stack size
2016-03-21 18:32:50 +01:00
e23a41225f
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.
2016-03-21 17:31:26 +01:00
8bf5a60fdd
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Updated NEWS
Updated NEWS
Reworked Fix bug #52098
Fix bug #52098
2016-03-21 15:40:50 +01:00
cb240fe711
Updated NEWS
2016-03-21 15:40:01 +01:00
5ba7b9af1b
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
2016-03-21 15:39:48 +01:00
abbe1551d6
Updated NEWS
2016-03-21 15:26:21 +01:00
d3d64b7c62
Reworked Fix bug #52098
2016-03-21 15:23:18 +01:00
e541cd8e6b
Fix bug #52098
2016-03-21 15:04:11 +01:00
4141167975
Merge branch 'PHP-7.0'
...
* PHP-7.0:
array_dup should not copy the nApplyCount
Also protects object to array cast
2016-03-21 19:20:11 +08:00
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
60b72e434b
Avoid data bypass delays between integer and floating point execution units on x86 CPUs.
2016-03-21 13:03:30 +03:00
63958350d8
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Update NEWS
Update NEWS for efacdc3FIX #71831 : CURLOPT_NOPROXY applied as long instead of string
2016-03-21 16:44:42 +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
1e5ac8940a
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fix bug #71835 (json_encode sometimes incorrectly detects recursion with JsonSerializable)
2016-03-21 16:22:02 +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
85ccebc1c2
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fix bug #71750 : use zend_string_safe_alloc for calculated allocations
Fix bug #71735 : Double-free in SplDoublyLinkedList::offsetSet
2016-03-20 22:51:12 -07: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
dab8e584da
Merge branch 'PHP-7.0'
2016-03-20 18:18:14 +01:00
f3309173f9
Fixed bug #62059
2016-03-20 18:17:44 +01:00
c4ccb5d5fa
Merge branch 'PHP-7.0'
2016-03-20 17:48:22 +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
6d98584d00
Merge branch 'PHP-7.0'
2016-03-20 13:52:00 +01: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
0cacbae410
Merge branch 'PHP-7.0'
2016-03-20 04:55:11 -07:00
9564998e49
Fixed Bug #71859 (zend_objects_store_call_destructors operates on realloced memory, crashing)
2016-03-20 04:52:57 -07:00
24f63b1c32
Fix broken merge
2016-03-20 01:35:51 +01:00
80a722a634
Drop some dead defines
2016-03-20 01:35:51 +01:00
ba4b2a60f9
Replace php_math_is_finite with zend_finite
2016-03-20 00:15:39 +00:00
e8f056e535
Merge branch 'PHP-7.0'
2016-03-18 20:29:09 +01: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
09da666cfa
Merge branch 'PHP-7.0'
2016-03-18 20:00:19 +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
c5212da8b5
Merge branch 'PHP-7.0'
2016-03-18 19:31:43 +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
Xinchen Hui