php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-31 20:53:00 +02:00
Code Issues Packages Projects Releases Wiki Activity
100,161 Commits 547 Branches 1,481 Tags
f33bfd4e447d7d7717afa031c2fbfc022d5987ce
Commit Graph

44125 Commits

Author SHA1 Message Date
Xinchen Hui
f33bfd4e44 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Update NEWS
  Fix memory leak(null coalescing operator with Spl hash)
 2016-11-21 11:46:13 +08:00
Xinchen Hui
270f9a0216 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Update NEWS
  Fix memory leak(null coalescing operator with Spl hash)
 2016-11-21 11:46:03 +08:00
Tyson Andre
cdb7aafc23 Fix memory leak(null coalescing operator with Spl hash) 
The SEPARATE_ARG_IF_REF macro increased the refcount of the object passed as a
key.
However, when the key did not exist in the ArrayAccess implementation,
the code returned early without trying to decrement the refcount.

Add a test of `??` succeeding+failing on a SplObjectStorage instance.
 2016-11-20 15:46:13 -08:00
Kalle Sommer Nielsen
eb6a816425 Merge branch 'master' of git.php.net:php-src 2016-11-20 23:36:44 +01:00
Kalle Sommer Nielsen
3ed0af3252 Kill some more strlen() calls and fix a possible missing NULL pointer check 
Thanks to Anatol for review
 2016-11-20 23:36:19 +01:00
Levi Morrison
5ff2990cb3 Refactor: rename variables to match documentation 
Rename 'arr' to 'pieces'
Rename 'delim' to 'glue'
 2016-11-20 14:54:06 -07:00
Kalle Sommer Nielsen
4f6f15358b Merge branch 'master' of git.php.net:php-src 2016-11-20 22:40:15 +01:00
Nikita Popov
45f7b2bcc8 Fix CRLF line-endings in tests 
Also fix a single instance of CRLF in ibase_query.c.
 2016-11-20 22:31:24 +01:00
Jakub Zelenka
563a341df7 Merge branch 'PHP-7.1' 2016-11-20 20:39:32 +00:00
Jakub Zelenka
f284479734 Merge branch 'PHP-7.0' into PHP-7.1 2016-11-20 20:38:34 +00:00
Jakub Zelenka
60574ea1ac Fix bug #73526 (php_json_encode depth issue) 2016-11-20 20:36:03 +00:00
Nikita Popov
42449d431f Merge branch 'PHP-7.1' 2016-11-20 21:19:34 +01:00
Nikita Popov
47252a1e74 Merge branch 'PHP-7.0' into PHP-7.1 2016-11-20 21:19:20 +01:00
Craig Duncan
685b1292e9 Fix bug #73538 
Remove any previous default headers and replace with the specified
ones, as documented, and as is the case when a single header is
passed.
 2016-11-20 21:18:28 +01:00
Pedro Magalhães
617dcf1b37 Remove the binary cast from unrelated tests 2016-11-20 21:11:53 +01:00
Pedro Magalhães
9c5af4e4cb Remove the b prefix from literals on unrelated tests 2016-11-20 21:11:53 +01:00
Jakub Zelenka
b98357823a Merge branch 'PHP-7.1' 2016-11-20 20:08:34 +00:00
Jakub Zelenka
ce4869f038 Fix bug #73478 (openssl_pkey_new() generates wrong pub/priv keys with Diffie Hellman) 2016-11-20 20:06:39 +00:00
Kalle Sommer Nielsen
53ca6fdaa4 Remove undefined variable if ext/ftp was built with SSL 2016-11-20 19:37:24 +01:00
Kalle Sommer Nielsen
d489569725 Fix typo 2016-11-20 19:36:48 +01:00
Kalle Sommer Nielsen
06767ffcbe Shave off a strlen() call in ftp_mkdir() 2016-11-20 19:36:36 +01:00
Tom Van Looy
442fd2f92a Cleanup tests version checks 2016-11-20 14:16:50 +01:00
Xinchen Hui
6ee8581a0e Removed not used field 2016-11-20 15:52:52 +08:00
Xinchen Hui
575285987d Merge branch 'PHP-7.1' 
* PHP-7.1:
  Update NEWS
  Fixed bug #73483 (Segmentation fault on pcre_replace_callback)
  Fix #73219 (fix acinclude when / is present)
  make it possible to show specific help pages without interactive session
  make it possible to show specific help pages without interactive session
 2016-11-20 15:47:54 +08:00
Xinchen Hui
0f5d03025f Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #73483 (Segmentation fault on pcre_replace_callback)
  Fix #73219 (fix acinclude when / is present)
  make it possible to show specific help pages without interactive session

Conflicts:
	acinclude.m4
 2016-11-20 15:46:53 +08:00
Xinchen Hui
ebfd93f725 Fixed bug #73483 (Segmentation fault on pcre_replace_callback) 2016-11-20 15:44:27 +08:00
Nikita Popov
8113daef49 json_encode(): Detect recursion earlier 
json_encode() used a peculiar way of apply-count management,
whereby the apply-count was not incremented for the outermost
object/array, so that recursion was only detected after two
levels.
 2016-11-19 23:52:08 +01:00
Kalle Sommer Nielsen
ddf95667c4 Remove support for REALTIME_PRIORITY_CLASS in proc_nice() on Windows. 
The reasoning for this is because that it requires special permissions and can in the end be dangerous, discovered by Anatol.
 2016-11-19 00:32:07 +01:00
Anatol Belski
271ed78a31 Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix test portability
 2016-11-18 22:11:41 +01:00
Anatol Belski
c7d0571ef4 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix test portability
 2016-11-18 22:11:25 +01:00
Anatol Belski
48191010d5 fix test portability 2016-11-18 22:10:41 +01:00
Nikita Popov
63c77cb1f9 Merge branch 'PHP-7.1' 2016-11-18 21:42:20 +01:00
Nikita Popov
8bb3957270 Fixed bug #73303 2016-11-18 21:41:43 +01:00
Dmitry Stogov
628cde2fae Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed memory leaks in parse_ini_file()
 2016-11-18 16:19:00 +03:00
Dmitry Stogov
d769a020df Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed memory leaks in parse_ini_file()
 2016-11-18 16:18:22 +03:00
Dmitry Stogov
97b65cc9c2 Fixed memory leaks in parse_ini_file() 2016-11-18 16:17:52 +03:00
Anatol Belski
628533caa0 Merge branch 'PHP-7.1' 
* PHP-7.1:
  extend skipif
 2016-11-18 12:00:36 +01:00
Anatol Belski
9ab0db0813 extend skipif 2016-11-18 12:00:02 +01:00
Adam Baratz
07e395a00d Revert "Remove PDOStatement::activeQueryString()" 
This reverts commit 552c957500.
 2016-11-17 11:25:31 -05:00
Nikita Popov
0004f7e86d Merge branch 'PHP-7.1' 2016-11-17 13:48:07 +01:00
Nikita Popov
226b82b127 RC inference fixes 2016-11-17 13:47:36 +01:00
Dmitry Stogov
05d382e7ec Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0 
* 'PHP-7.0' of git.php.net:php-src:
  Updated NEWS
  Improvement for bug73297
  Simplify ext/standard/tests/http/bug73297.phpt
  http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
  Add failing test for bug#73297
 2016-11-17 14:07:11 +03:00
Dmitry Stogov
087665e65d Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1 
* 'PHP-7.1' of git.php.net:php-src:
  Updated NEWS
  Improvement for bug73297
  Simplify ext/standard/tests/http/bug73297.phpt
  http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
  Add failing test for bug#73297
 2016-11-17 14:06:56 +03:00
Dmitry Stogov
3461b706df Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  Improvement for bug73297
  Simplify ext/standard/tests/http/bug73297.phpt
  http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
  Add failing test for bug#73297
 2016-11-17 14:06:35 +03:00
Dmitry Stogov
c87ab8aec0 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed 64-bit build
 2016-11-17 14:06:09 +03:00
Dmitry Stogov
205c69939a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed 64-bit build
 2016-11-17 14:05:48 +03:00
Dmitry Stogov
c2173c16d0 Fixed 64-bit build 2016-11-17 14:05:22 +03:00
Julien Pauli
4b2cbc3f2f Improvement for bug73297 2016-11-17 11:51:53 +01:00
Rowan Collins
66ac73bee8 Simplify ext/standard/tests/http/bug73297.phpt 2016-11-17 11:51:53 +01:00
Rowan Collins
94374c51e7 http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses 2016-11-17 11:51:53 +01:00