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
Xinchen Hui
a39d2f8ea1
Update NEWS
2016-11-21 11:45:49 +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
e59089c6e5
Revert "Added --enable-asm on Windows"
...
This reverts commit d711798813
2016-11-21 00:46:04 +01: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
d711798813
Added --enable-asm on Windows
...
This argument is disabled by default, but if enabled it will create a sub directory in the output directory called 'asm' and dump each compiled .c file's asm there
2016-11-20 22:49:34 +01: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
Kalle Sommer Nielsen
644821e89f
Minor grammar
2016-11-20 21:25:25 +01: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
b581f7d860
No need to keep the version info for old VC versions we don't even support anymore
2016-11-20 20:56:49 +01:00
Kalle Sommer Nielsen
7e8fd3fb5a
Update inline comment with VS.net 2017 + fix typo
2016-11-20 20:55:02 +01:00
Kalle Sommer Nielsen
39cfeea20b
Remove typo
2016-11-20 20:52:22 +01:00
Kalle Sommer Nielsen
acbc007a7d
Use $(CC) consistently in the Makefile
2016-11-20 20:50:25 +01: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
Bob Weinand
e3feeba3ae
Merge branch 'PHP-7.1'
2016-11-20 19:20:48 +01:00
Bob Weinand
110a6cc6c0
Merge branch 'PHP-7.0' into PHP-7.1
2016-11-20 19:20:09 +01:00
Bob Weinand
bc30206b8a
Revert "Revert "Remove a few unused write warning""
...
This reverts commit ff5a65d26b
2016-11-20 19:18:50 +01:00
Nikita Popov
d512f21930
Merge branch 'PHP-7.1'
2016-11-20 19:10:29 +01:00
Nikita Popov
c58378619b
Merge branch 'PHP-7.0' into PHP-7.1
2016-11-20 19:10:03 +01:00
Nikita Popov
ff5a65d26b
Revert "Remove a few unused write warning (backport from master, oops)s"
...
This reverts commit c65d24eaa3
2016-11-20 19:09:05 +01:00
Bob Weinand
d7deaac362
Merge branch 'PHP-7.1'
2016-11-20 14:19:40 +01:00
Bob Weinand
b7fee22e73
Merge branch 'PHP-7.0' into PHP-7.1
2016-11-20 14:18:54 +01:00
Bob Weinand
c65d24eaa3
Remove a few unused write warning (backport from master, oops)s
2016-11-20 14:17:14 +01:00
Tom Van Looy
442fd2f92a
Cleanup tests version checks
2016-11-20 14:16:50 +01:00
Bob Weinand
d37482679a
Remove a few unused write warnings
2016-11-20 14:15:02 +01:00
Joe Watkins
40da843ab5
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
2016-11-20 08:34:16 +00:00
Joe Watkins
c17eca1379
Merge branch 'master' of git.php.net:/php-src
2016-11-20 08:33:53 +00:00
Joe Watkins
43bd0146bc
Merge branch 'PHP-7.1'
...
* PHP-7.1:
fix #72180 , #73219
2016-11-20 08:33:26 +00:00
Joe Watkins
f67784907e
fix #72180 , #73219
2016-11-20 08:32:26 +00: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
fcac0f23e0
Update NEWS
2016-11-20 15:47:39 +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
Joe Watkins
274951a4a2
Fix #73219 (fix acinclude when / is present)
2016-11-20 05:34:08 +00:00
