53ca6fdaa4
Remove undefined variable if ext/ftp was built with SSL
2016-11-20 19:37:24 +01:00
d489569725
Fix typo
2016-11-20 19:36:48 +01:00
06767ffcbe
Shave off a strlen() call in ftp_mkdir()
2016-11-20 19:36:36 +01:00
442fd2f92a
Cleanup tests version checks
2016-11-20 14:16:50 +01:00
6ee8581a0e
Removed not used field
2016-11-20 15:52:52 +08:00
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
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
ebfd93f725
Fixed bug #73483 (Segmentation fault on pcre_replace_callback)
2016-11-20 15:44:27 +08:00
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
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
271ed78a31
Merge branch 'PHP-7.1'
...
* PHP-7.1:
fix test portability
2016-11-18 22:11:41 +01:00
c7d0571ef4
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix test portability
2016-11-18 22:11:25 +01:00
48191010d5
fix test portability
2016-11-18 22:10:41 +01:00
63c77cb1f9
Merge branch 'PHP-7.1'
2016-11-18 21:42:20 +01:00
8bb3957270
Fixed bug #73303
2016-11-18 21:41:43 +01:00
628cde2fae
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed memory leaks in parse_ini_file()
2016-11-18 16:19:00 +03:00
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
97b65cc9c2
Fixed memory leaks in parse_ini_file()
2016-11-18 16:17:52 +03:00
628533caa0
Merge branch 'PHP-7.1'
...
* PHP-7.1:
extend skipif
2016-11-18 12:00:36 +01:00
9ab0db0813
extend skipif
2016-11-18 12:00:02 +01:00
07e395a00d
Revert "Remove PDOStatement::activeQueryString()"
...
This reverts commit 552c957500
2016-11-17 11:25:31 -05:00
0004f7e86d
Merge branch 'PHP-7.1'
2016-11-17 13:48:07 +01:00
226b82b127
RC inference fixes
2016-11-17 13:47:36 +01:00
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
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
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
c87ab8aec0
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed 64-bit build
2016-11-17 14:06:09 +03:00
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
c2173c16d0
Fixed 64-bit build
2016-11-17 14:05:22 +03:00
4b2cbc3f2f
Improvement for bug73297
2016-11-17 11:51:53 +01:00
66ac73bee8
Simplify ext/standard/tests/http/bug73297.phpt
2016-11-17 11:51:53 +01:00
94374c51e7
http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
2016-11-17 11:51:53 +01:00
4683377dfa
Add failing test for bug#73297
2016-11-17 11:51:53 +01:00
0f9225f893
Improvement for bug73297
2016-11-17 11:51:30 +01:00
773bc082ca
Simplify ext/standard/tests/http/bug73297.phpt
2016-11-17 11:51:29 +01:00
417162a9ba
http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
2016-11-17 11:51:29 +01:00
12c4ff9b87
Add failing test for bug#73297
2016-11-17 11:51:29 +01:00
607049f2d1
Improvement for bug73297
2016-11-17 11:50:36 +01:00
8b54b3654d
Simplify ext/standard/tests/http/bug73297.phpt
2016-11-17 11:50:36 +01:00
f20d261acd
http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
2016-11-17 11:50:36 +01:00
5a882990a6
Add failing test for bug#73297
2016-11-17 11:50:36 +01:00
558166bd41
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed test
2016-11-17 13:44:08 +03:00
c8dc23e9ba
Fixed test
2016-11-17 13:43:45 +03:00
222d22f3e1
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Prevent modification of immutable arrays (ext/mbstring/tests/bug26639.phpt failure with opcache.protect_memory=1)
2016-11-17 13:35:10 +03:00
a56bba14e0
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Prevent modification of immutable arrays (ext/mbstring/tests/bug26639.phpt failure with opcache.protect_memory=1)
2016-11-17 13:34:32 +03:00
a67637039f
Prevent modification of immutable arrays (ext/mbstring/tests/bug26639.phpt failure with opcache.protect_memory=1)
2016-11-17 13:33:05 +03:00
610083bc06
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Overflow check
2016-11-17 13:18:58 +03:00
365d613480
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Overflow check
2016-11-17 13:18:25 +03:00
d4b3f89c53
Overflow check
2016-11-17 13:17:34 +03:00
c1001d22d2
Add expectations for invalid count() warnings
2016-11-17 09:33:04 +00:00
Kalle Sommer Nielsen