php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-26 17:38:14 +02:00
Code Issues Packages Projects Releases Wiki Activity
95,208 Commits 549 Branches 1,485 Tags
b867bd1c8d00701c0952fca4ea5ef9af39f9bb07
Commit Graph

41233 Commits

Author SHA1 Message Date
Nikita Popov b867bd1c8d Fix FETCH_CLASS_SELF comparisons 
Turns out those don't form a bitfield.
 2016-03-26 22:45:23 +01:00
Nikita Popov d3ed75b9eb Remove HAVE_CRYPT checks 
We always provide a crypt implementation. HAVE_CRYPT is only
relevant as to whether the crypt() C function exists.
 2016-03-25 21:09:47 +01:00
Nikita Popov be7a50b9ab Move HAVE_ATTRIBUTE_ALIGNED check outside crypt block 
This is checked outside the crypt() implementation as well.
 2016-03-25 20:50:52 +01:00
Nikita Popov 786effaff6 Remove PHP_*_CRYPT constants 
They are always 1.
 2016-03-25 20:48:34 +01:00
Nikita Popov a142c274fb Ensure that all crypt() formats are supported 
Checks for md5, sha512 and sha256 were missing.

As a result the PHP_*_CRYPT constants are always 1 now.
 2016-03-25 20:39:14 +01:00
Nikita Popov e9ee9e13f0 Merge branch 'PHP-7.0' 2016-03-25 20:23:30 +01:00
Nikita Popov bd90f5507f Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	ext/standard/crypt.c
 2016-03-25 20:23:04 +01:00
Nikita Popov 54da966883 Fixed bug #67512 2016-03-25 20:18:46 +01:00
Nikita Popov 8e5b139732 Evaluate arguments of new for classes without ctor 
ML: http://markmail.org/message/4b3mk7jid64zvz34
 2016-03-25 19:11:37 +01:00
Xinchen Hui 0e5fa32883 Merge branch 'PHP-7.0' 2016-03-25 12:35:20 +08:00
Xinchen Hui 1929fc9b16 Fixed bug #71891 (header_register_callback() and register_shutdown_function()) 
Actually, this fixed the memleak not the behavior(it is expected
behavior that "shutdown" is not outputed)
 2016-03-25 12:34:22 +08:00
Derick Rethans 454ae8a6f3 Updated to version 2016.3 (2016c) 2016-03-24 11:09:08 +00:00
Derick Rethans 70878a92b1 Updated to version 2016.3 (2016c) 2016-03-24 11:09:07 +00:00
Derick Rethans c4681ec8e1 Updated to version 2016.3 (2016c) 2016-03-24 11:09:05 +00:00
Xinchen Hui 8643d7a595 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed Bug #71884 (Null pointer deref (segfault) in stream_context_get_default)
 2016-03-23 16:16:47 +08:00
Xinchen Hui a3946de339 Fixed Bug #71884 (Null pointer deref (segfault) in stream_context_get_default) 2016-03-23 16:16:26 +08:00
Dmitry Stogov d8b75b0807 Convert ASSIGN_ADD $a, $b into $a = ADD $a, $b, if possible. 2016-03-22 23:57:26 +03:00
Anatol Belski 76d612129b Merge branch 'PHP-7.0' 
* PHP-7.0:
  if there's no JIT support, no RINIT is really needed
  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.
 2016-03-22 21:48:11 +01:00
Anatol Belski 241ba9dcb1 if there's no JIT support, no RINIT is really needed 2016-03-22 21:42:21 +01:00
Dmitry Stogov 94812fa6cd Convert ASSIGN_ADD $cv, int(1) into PRE_INC $cv, if it's safe. 2016-03-22 22:50:43 +03:00
Xinchen Hui 3f3180e35f Merge branch 'PHP-7.0' 
* PHP-7.0:
  Update test script
 2016-03-22 11:28:45 +08:00
Xinchen Hui b49ec68134 Update test script 2016-03-22 11:28:19 +08:00
Anatol Belski 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
Anatol Belski e988239634 decrease the default PCRE JIT stack to 64K 2016-03-21 18:59:39 +01:00
Anatol Belski 9e521485b5 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Increase PCRE JIT stack size
 2016-03-21 18:32:50 +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 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
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 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 63958350d8 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Update NEWS
  Update NEWS for efacdc3
  FIX #71831: CURLOPT_NOPROXY applied as long instead of string
 2016-03-21 16:44:42 +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 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 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
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 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
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
Nikita Popov dab8e584da Merge branch 'PHP-7.0' 2016-03-20 18:18:14 +01:00
Nikita Popov f3309173f9 Fixed bug #62059 2016-03-20 18:17:44 +01:00
Nikita Popov c4ccb5d5fa Merge branch 'PHP-7.0' 2016-03-20 17:48:22 +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
Andrea Faulds ba4b2a60f9 Replace php_math_is_finite with zend_finite 2016-03-20 00:15:39 +00:00
Nikita Popov e8f056e535 Merge branch 'PHP-7.0' 2016-03-18 20:29:09 +01: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 09da666cfa Merge branch 'PHP-7.0' 2016-03-18 20:00:19 +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