Xinchen Hui
49702ad7fb
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)
2017-10-15 10:28:46 +08:00
Xinchen Hui
816758eda2
Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)
2017-10-15 10:28:28 +08:00
Anatol Belski
5c59dd0047
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix the version check causing the test fail
2017-09-18 12:06:23 +02:00
Anatol Belski
9641586efa
Fix the version check causing the test fail
2017-09-18 12:04:31 +02:00
Nikita Popov
0b69ce72b8
Merge branch 'PHP-7.0' into PHP-7.1
2017-09-05 18:14:10 +02:00
Nikita Popov
42549b7844
Add missing null termination
2017-09-05 18:13:50 +02:00
Nikita Popov
e866e05b0d
Merge branch 'PHP-7.0' into PHP-7.1
2017-09-05 16:24:21 +02:00
Bouke van der Bijl
cd9d90f4d4
Fixed bug #70470
2017-09-05 16:23:32 +02:00
Joe Watkins
b44484b912
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Update copyright year to 2017
2017-07-24 17:24:10 +01:00
Peter Kokot
924ff6164e
Update copyright year to 2017
2017-07-24 17:23:57 +01:00
Xinchen Hui
caf35c5cf5
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Add simple cli test for PATH/HOST ini sections
Fixed bug #74600
2017-06-12 17:21:35 +08:00
Manuel Mausz
91f129ebf7
Add simple cli test for PATH/HOST ini sections
2017-06-09 23:28:19 +02:00
Xinchen Hui
78b10dd9d6
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Added cleanup
2017-05-17 23:25:17 +08:00
Xinchen Hui
0954ea8d6d
Added cleanup
2017-05-17 23:24:58 +08:00
Xinchen Hui
f38487a0e0
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Added test for bug #74600
2017-05-17 23:21:38 +08:00
Xinchen Hui
ef09bc0645
Added test for bug #74600
2017-05-17 23:21:18 +08:00
Anatol Belski
2ec54af8df
fix buffer overflow
2017-04-03 14:22:23 +02: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
19363de12f
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Increase wait time for tests involving sockets to improve Travis relability
2017-01-13 06:45:17 +00:00
Mitch Hagstrand
fd92b91188
Increase wait time for tests involving sockets to improve Travis relability
...
1. Increased sleep time from 25ms to 50ms
2. Added sleep to shutdown handlers
2017-01-13 06:45:04 +00:00
Joe Watkins
aadc84f6f7
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed #73902 mention router support in usage output for php-cli
2017-01-10 06:20:56 +00:00
Joe Watkins
125ee6a68e
Fixed #73902 mention router support in usage output for php-cli
2017-01-10 06:19:34 +00:00
Sammy Kaye Powers
dac6c639bb
Update copyright headers to 2017
2017-01-04 11:23:42 -06:00
Sammy Kaye Powers
478f119ab9
Update copyright headers to 2017
2017-01-04 11:14:55 -06:00
Nikita Popov
a5027d43dd
Merge branch 'PHP-7.0' into PHP-7.1
2017-01-01 21:09:27 +01:00
Nikita Popov
935b5cb11e
Flush stderr on win32 in cli_log_message
...
This allows us to unfork a bunch of tests for Windows.
2017-01-01 21:09:02 +01:00
Nikita Popov
937115f8c5
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-27 21:52:33 +01:00
Mitch Hagstrand
2d51267c07
Makes the sapi web server and curl tests more reliable
...
1. Increased the time for the sapi/cli/tests/php_cli_server.inc to accept connections.
2. sapi/cli/tests/php_cli_server.inc has errors messages and a `stop` function.
3. bug67429.phpt uses the `stop` function to shutdown the webserver before starting a new one.
4. Removed ext/curl/tests/bug48203_multi-win32.phpt test now that ext/curl/tests/bug48203_multi.phpt
runs on Windows also.
2016-12-27 21:52:05 +01:00
Anatol Belski
b2b63ce993
extend skipif
...
This test won't pass on Windows. The main reason is that the multiline
input is not really possible to create on cmd. But also, because of the
single quotes. And without multiline data piping, it doesn't make sense.
2016-11-18 02:23:17 +01:00
Anatol Belski
2860fd40d6
Better fix for bug #73360
...
This also fixes the TS issue. And, it also reveals that there's an
issue in the VCWD_* API to be possibly addressed.
2016-10-21 21:29:35 +02:00
Anatol Belski
fbf46d36ca
Revert "Fixed bug #73360 Unable to work in root with unicode chars"
...
This reverts commit 64fee0aecb .
2016-10-21 20:15:16 +02:00
Anatol Belski
64fee0aecb
Fixed bug #73360 Unable to work in root with unicode chars
2016-10-21 15:22:59 +02:00
Anatol Belski
53034feda5
pull ps_title behind the logic to support the current codepage
2016-08-11 13:38:28 +02:00
Nikita Popov
2fbfa7f62e
Merge branch 'PHP-7.0' into PHP-7.1
2016-08-09 15:35:04 +02:00
Nikita Popov
842e408c67
Don't copy mime types in CLI server
...
This is both unnecessary and causes leaks in valgrind.
2016-08-09 15:34:03 +02:00
Christoph M. Becker
b0558b3004
Merge branch 'PHP-7.0' into PHP-7.1
2016-07-28 17:00:54 +02:00
Christoph M. Becker
95190db84d
Merge branch 'PHP-5.6' into PHP-7.0
2016-07-28 16:54:36 +02:00
Christoph M. Becker
6e886f07a8
Fix #72676 : Test cli_process_title_unix fails on AIX
...
Patch provided by matthieu dot sarter dot external at atos dot net.
2016-07-28 16:51:45 +02:00
Anatol Belski
2349332b66
correct macro names
2016-07-17 12:33:26 +02:00
Martin Vobruba
2809a676b5
Pass error severity to SAPI modules and raise corresponding error level in Apache
2016-07-11 09:34:48 +02:00
Dmitry Stogov
0cfb47651c
Fixed compilation warnings
2016-06-28 11:37:51 +03:00
Xinchen Hui
de7a6b1232
MFH: Fixed fd leak (the origin commit can not be cherry-picked)
2016-06-28 11:36:27 +08:00
David Carlier
85e985f191
couple of resource leaks fixes and use after free's
2016-06-27 07:44:21 +01:00
Xinchen Hui
8de8636a2b
Merge branch 'PHP-7.0'
2016-06-24 18:08:28 -07:00
Xinchen Hui
0183a9af5a
Fixed bug #72484 (SCRIPT_FILENAME shows wrong path if the user specify router.php)
2016-06-24 18:08:16 -07:00
Dmitry Stogov
22ecd4428a
Fixed compilation warnings
2016-06-21 17:56:07 +03:00
Dmitry Stogov
1616038698
Added ZEND_ATTRIBUTE_FORMAT to some middind functions.
...
"%p" replaced by ZEND_LONG_FMT to avoid compilation warnings.
Fixed most incorrect use cases of format specifiers.
2016-06-21 16:00:37 +03:00
Dmitry Stogov
7cc1b00163
Improved support for zend-signals.
2016-06-20 22:41:14 +03:00
Dmitry Stogov
6ef43be1d7
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
Fixed the UTF-8 and long path support in the streams on Windows.
2016-06-20 14:59:35 +03:00