clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-30 14:26:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
93,888 Commits 494 Branches 1,367 Tags 793 MiB
fd9137c00c
Commit Graph

93888 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Popov
dc842bbf8d Fixed bug #71871 2016-03-21 22:49:18 +01:00
Anatol Belski
e988239634 decrease the default PCRE JIT stack to 64K 2016-03-21 18:59:39 +01:00
Anatol Belski
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
Julien Pauli
cb240fe711 Updated NEWS 2016-03-21 15:40:01 +01:00
Julien Pauli
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
Julien Pauli
abbe1551d6 Updated NEWS 2016-03-21 15:26:21 +01:00
Julien Pauli
d3d64b7c62 Reworked Fix bug #52098 2016-03-21 15:23:18 +01:00
Daniel Persson
e541cd8e6b Fix bug #52098 2016-03-21 15:04:11 +01:00
Xinchen Hui
d26ca89402 array_dup should not copy the nApplyCount 2016-03-21 19:19:05 +08:00
Xinchen Hui
9712a974be Also protects object to array cast 2016-03-21 19:12:50 +08:00
Xinchen Hui
a9a46f17be Update NEWS 2016-03-21 16:44:30 +08:00
Xinchen Hui
ead0dfc3c9 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
 2016-03-21 16:43:55 +08:00
Xinchen Hui
c9c8e70463 Update NEWS for efacdc3 2016-03-21 16:43:30 +08:00
Xinchen Hui
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
Xinchen Hui
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
Stanislav Malyshev
c4517b2a5e Fix bug #71750: use zend_string_safe_alloc for calculated allocations 2016-03-20 22:39:17 -07:00
Stanislav Malyshev
28a6ed9f9a Fix bug #71735: Double-free in SplDoublyLinkedList::offsetSet 2016-03-20 22:29:08 -07:00
Stanislav Malyshev
72281f29dd Fix bug #71860: Require valid paths for phar filenames 2016-03-20 21:33:11 -07:00
Stanislav Malyshev
1e9b175204 Fix bug #71860: Require valid paths for phar filenames 2016-03-20 21:24:12 -07:00
Nikita Popov
f3309173f9 Fixed bug #62059 2016-03-20 18:17:44 +01:00
Nikita Popov
12f2665df8 Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	ext/spl/spl_observer.c
 2016-03-20 17:48:06 +01:00
Nikita Popov
cc3cdd0057 Fixed bug #67582 2016-03-20 17:46:12 +01:00
Jakub Zelenka
7e069daa89 Fix bug #71835 (json_encode sometimes incorrectly detects recursion with JsonSerializable) 2016-03-20 15:56:27 +00:00
Nikita Popov
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
Nikita Popov
1f6d27d3d2 Fix use of UNDEF instead of NULL in read_dimension 2016-03-20 13:33:17 +01:00
Xinchen Hui
9564998e49 Fixed Bug #71859 (zend_objects_store_call_destructors operates on realloced memory, crashing) 2016-03-20 04:52:57 -07:00
Nikita Popov
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
Nikita Popov
a2522efa9f Add extra ArrayObject::sort() test 2016-03-18 19:59:08 +01:00
Nikita Popov
094c808374 Fix bug #71838 2016-03-18 19:58:52 +01:00
Nikita Popov
fd95555107 Fix ZEND_DEBUG condition 2016-03-18 19:31:34 +01:00
Michael Sierks
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
Dmitry Stogov
69c9be5c99 typo 2016-03-18 10:27:46 +03:00
Dmitry Stogov
11594e86b8 typo 2016-03-18 10:25:48 +03:00
Xinchen Hui
5b8d0dc6ae Fixed pdo_stmt.c: zval* being passed into zend_parse_parameters_ex 2016-03-18 11:50:03 +08:00
Dmitry Stogov
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
Anatol Belski
28b6f0232b fix and update NEWS 2016-03-17 19:04:56 +01:00
Anatol Belski
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
Anatol Belski
b8c9c92d44 fix and update NEWS 2016-03-17 19:02:08 +01:00
Xinchen Hui
a2ca4558b5 Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 2016-03-17 07:57:22 -07:00
Anatol Belski
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
Xinchen Hui
93499bfd8a Fixed test & ZEND_BOOL should result TMP_VAR 2016-03-17 07:55:25 -07:00
Xinchen Hui
345ecd9822 Fixed #71837 (Wrong arrays behaviour) 2016-03-17 07:41:41 -07:00
Anatol Belski
1b632cfe83 Backport patch for bug #71820 
Rev b4eedd128b
 2016-03-17 14:28:58 +01:00
Xinchen Hui
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
Xinchen Hui
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
Xinchen Hui
910e6dc6b8 Fixed for master 2016-03-17 21:10:08 +08:00
Remi Collet
e7f74a3f9b Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix NEWS
 2016-03-17 13:53:52 +01:00
Remi Collet
b5b1ba850a fix NEWS 2016-03-17 13:53:42 +01:00
Remi Collet
9073208f6c NEWS 2016-03-17 13:44:28 +01:00
Remi Collet
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