1
0
mirror of https://github.com/php/php-src.git synced 2026-04-28 18:53:33 +02:00
Commit Graph

101498 Commits

Author SHA1 Message Date
Dmitry Stogov 1f7bf2bfd6 Optimized extract(). Avoided double hash lookups and repeatable checks through loop splitting. 2017-01-20 10:39:27 +03:00
Joe Watkins 71a42477ca Merge branch 'PHP-7.1'
* PHP-7.1:
  Update comment, incorrect since 224aaf94
2017-01-19 10:49:09 +00:00
SjonHortensius 631861e1fa Update comment, incorrect since 224aaf94
In 224aaf94; the warning was enabled; making the comment above incorrect. I've updated the comment to reflect the current code
2017-01-19 10:48:54 +00:00
Xinchen Hui 0311dc8697 Merge branch 'PHP-7.1'
* PHP-7.1:
  Fixed another part in ldap (bug #73933)
2017-01-19 12:24:04 +08:00
Xinchen Hui 5e09031144 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed another part in ldap (bug #73933)
2017-01-19 12:23:56 +08:00
Xinchen Hui cad2598fcb Fixed another part in ldap (bug #73933) 2017-01-19 12:23:23 +08:00
Ferenc Kovacs 60d075aa65 Merge branch 'PHP-7.1' 2017-01-19 01:23:36 +01:00
Ferenc Kovacs 2efb63bf00 Merge branch 'PHP-7.0' into PHP-7.1 2017-01-19 01:22:10 +01:00
Ferenc Kovacs 8c75dbc498 Merge branch 'PHP-5.6' into PHP-7.0 2017-01-19 01:20:57 +01:00
Ferenc Kovacs cf649f59cb update NEWS 2017-01-19 01:16:31 +01:00
Nikita Popov 0dc2b832a2 Merge branch 'PHP-7.1' 2017-01-18 21:20:07 +01:00
Nikita Popov fec3a65ba4 Merge branch 'PHP-7.0' into PHP-7.1 2017-01-18 21:20:00 +01:00
Mitch Hagstrand 8ba6d622e5 Removing zmemcheck from .gdbinit
It doesn't seem to make sense anymore
2017-01-18 21:19:48 +01:00
Andrey Andreev d89d149edf Disallow non-crypto hashes in HMAC and PBKDF2
For this purpose add is_crypto flag to php_hash_ops.
2017-01-18 21:13:54 +01:00
Joe Watkins 5bc81620ef Merge branch 'PHP-7.1'
* PHP-7.1:
  Fix bug #73949 leak in mysqli_fetch_object
2017-01-18 18:24:49 +00:00
Joe Watkins 6d89640d55 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix bug #73949 leak in mysqli_fetch_object
2017-01-18 18:23:59 +00:00
Joe Watkins f9226f9bf3 Fix bug #73949 leak in mysqli_fetch_object 2017-01-18 18:22:57 +00:00
Joe Watkins 409467dc2f Merge branch 'PHP-7.1'
* PHP-7.1:
  Remove remnants of TSMRLS_* macro calls
2017-01-18 17:46:35 +00:00
Joe Watkins bbe21ccf38 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Remove remnants of TSMRLS_* macro calls
2017-01-18 17:46:11 +00:00
Thomas Punt fb8486f3bd Remove remnants of TSMRLS_* macro calls 2017-01-18 17:42:45 +00:00
Joe Watkins f485aca646 Merge branch 'PHP-7.1'
* PHP-7.1:
  DNS CAA record type implementation and tests for https://bugs.php.net/bug.php?id=73850
2017-01-18 17:25:52 +00:00
Joe Watkins bce548d8e6 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  DNS CAA record type implementation and tests for https://bugs.php.net/bug.php?id=73850
2017-01-18 17:23:29 +00:00
Marcus Bointon 280e9cb28d DNS CAA record type implementation and tests for https://bugs.php.net/bug.php?id=73850 2017-01-18 17:23:08 +00:00
Leigh 2a9ee3c6f6 Merge branch 'PHP-7.1' 2017-01-18 15:04:19 +00:00
Leigh 85589ca660 Add php_openssl_store_errors to bailouts 2017-01-18 15:02:52 +00:00
Leigh 9c5a1c8ae9 Merge branch 'PHP-7.1' 2017-01-18 14:48:36 +00:00
Leigh d2f07edf71 Merge branch 'PHP-7.0' into PHP-7.1 2017-01-18 14:47:49 +00:00
Leigh e7e96fe2e0 Change free to OPENSSL_free 2017-01-18 14:45:41 +00:00
Remi Collet 70ee3fcd1a Merge branch 'PHP-7.1'
* PHP-7.1:
  NEWS
  NEWS
  Fix #73956 Link use CC instead of CXX
2017-01-18 13:02:51 +01:00
Remi Collet 7673c9847b NEWS 2017-01-18 13:02:33 +01:00
Remi Collet 2ce8a4cf87 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  NEWS
  Fix #73956 Link use CC instead of CXX
2017-01-18 13:02:19 +01:00
Remi Collet 6af7753e36 NEWS 2017-01-18 13:02:03 +01:00
Remi Collet 6af22d0d3e Fix #73956 Link use CC instead of CXX 2017-01-18 13:00:49 +01:00
Joe Watkins a1fd706d7d Merge branch 'PHP-7.1'
* PHP-7.1:
  Remove more TSRMLS_CC macros
2017-01-18 10:00:26 +00:00
Thomas Punt 9977bdf9b3 Remove more TSRMLS_CC macros 2017-01-18 10:00:15 +00:00
Joe Watkins 7c17936c70 Merge branch 'PHP-7.1'
* PHP-7.1:
  Fix ce comparison
2017-01-18 05:06:59 +00:00
Joe Watkins 43612e9593 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix ce comparison
2017-01-18 05:06:07 +00:00
Thomas Punt a22f181736 Fix ce comparison 2017-01-18 05:05:53 +00:00
Joe Watkins cc91b01dca Merge branch 'PHP-7.1'
* PHP-7.1:
  updates to release docs
2017-01-17 20:33:57 +00:00
Joe Watkins 4edaa3f1e7 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  updates to release docs
2017-01-17 20:33:44 +00:00
Joe Watkins e00c2f335c updates to release docs 2017-01-17 20:33:25 +00:00
Joe Watkins 9fdd391d6a Merge branch 'PHP-7.1'
* PHP-7.1:
  Fixes in .gdbinit for ZE 3
2017-01-17 17:08:08 +00:00
Joe Watkins 13e6dacb6b Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixes in .gdbinit for ZE 3
2017-01-17 17:07:53 +00:00
Mitch Hagstrand db894fa6aa Fixes in .gdbinit for ZE 3
1. Fixed print_pi function
2. Fixed printing properties in ____printzv_contents
3. Added optional max length parameter in ____print_str
2017-01-17 17:07:31 +00:00
Anatol Belski 11f8fc199d Merge branch 'PHP-7.1'
* PHP-7.1:
  [ci skip] sync NEWS
2017-01-17 10:59:56 +01:00
Anatol Belski 1e225a6115 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  [ci skip] sync NEWS
2017-01-17 10:57:56 +01:00
Anatol Belski 3f960255f4 [ci skip] sync NEWS 2017-01-17 10:56:17 +01:00
Anatol Belski 7ad94a010d fix changed symbol 2017-01-17 10:10:12 +01:00
Anatol Belski 23db1ce3ba Merge branch 'PHP-7.1'
* PHP-7.1:
  Fix #73869: Signed Integer Overflow gd_io.c
  Fix #73868: DOS vulnerability in gdImageCreateFromGd2Ctx()
2017-01-17 09:36:42 +01:00
Anatol Belski cea050b8da Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix #73869: Signed Integer Overflow gd_io.c
  Fix #73868: DOS vulnerability in gdImageCreateFromGd2Ctx()
2017-01-17 09:35:26 +01:00