5 Commits

Author	SHA1	Message	Date
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
SeeSchloss	f33c7b3e41	Added mandatory Date: header to built-in webserver	2016-06-02 12:27:48 +02:00
Adam Harvey	e082199d8e	Merge branch 'PHP-5.5' into PHP-5.6 ... * PHP-5.5: Add 308 and 426 to the HTTP response code map in the CLI server.	2014-06-12 17:57:36 -07:00
Adam Harvey	fe67674809	Add 308 and 426 to the HTTP response code map in the CLI server. ... Implements FR #67429 (CLI server is missing some new HTTP response codes).	2014-06-12 17:54:29 -07:00