diff options
author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-06-23 13:54:42 +0200 |
---|---|---|
committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-06-24 14:08:11 +0200 |
commit | 94df6dc3fd07fa187ba09c587a8d1357fd8bbe6f (patch) | |
tree | 37d2e99d9afe16a5c635e8006b15eb5b4669d18f | |
parent | df27bfe58bb7bc0b2cb8f182a94347d36e2cb6b6 (diff) | |
download | php-git-94df6dc3fd07fa187ba09c587a8d1357fd8bbe6f.tar.gz |
Split test case
This test is failing on AppVeyor almost all of the time, so splitting
it seems appropriate. This also allows us to rid php_cli_server_stop()
which was only used by this test case.
-rw-r--r-- | sapi/cli/tests/bug67429.phpt | 55 | ||||
-rw-r--r-- | sapi/cli/tests/bug67429_1.phpt | 42 | ||||
-rw-r--r-- | sapi/cli/tests/bug67429_2.phpt | 42 | ||||
-rw-r--r-- | sapi/cli/tests/php_cli_server.inc | 17 |
4 files changed, 84 insertions, 72 deletions
diff --git a/sapi/cli/tests/bug67429.phpt b/sapi/cli/tests/bug67429.phpt deleted file mode 100644 index a047de6e31..0000000000 --- a/sapi/cli/tests/bug67429.phpt +++ /dev/null @@ -1,55 +0,0 @@ ---TEST-- -FR #67429 (CLI server is missing some new HTTP response codes) ---SKIPIF-- -<?php -include "skipif.inc"; -?> ---FILE-- -<?php -include "php_cli_server.inc"; - -// This creates a new server for each response code -foreach ([308, 426] as $code) { - $proc_handle = php_cli_server_start(<<<PHP -http_response_code($code); -PHP - ); - - list($host, $port) = explode(':', PHP_CLI_SERVER_ADDRESS); - $port = intval($port)?:80; - - $fp = fsockopen($host, $port, $errno, $errstr, 0.5); - if (!$fp) { - die("connect failed"); - } - - if(fwrite($fp, <<<HEADER -GET / HTTP/1.1 - - -HEADER - )) { - while (!feof($fp)) { - echo fgets($fp); - } - } - - fclose($fp); - // Shutdown the servers or another server may not be able to start - // because of the this server still being bound to the port - - php_cli_server_stop($proc_handle); -} -?> ---EXPECTF-- -HTTP/1.1 308 Permanent Redirect -Date: %s -Connection: close -X-Powered-By: %s -Content-type: text/html; charset=UTF-8 - -HTTP/1.1 426 Upgrade Required -Date: %s -Connection: close -X-Powered-By: %s -Content-type: text/html; charset=UTF-8 diff --git a/sapi/cli/tests/bug67429_1.phpt b/sapi/cli/tests/bug67429_1.phpt new file mode 100644 index 0000000000..8f3d6c79bc --- /dev/null +++ b/sapi/cli/tests/bug67429_1.phpt @@ -0,0 +1,42 @@ +--TEST-- +FR #67429 (CLI server is missing some new HTTP response codes) +--SKIPIF-- +<?php +include "skipif.inc"; +?> +--FILE-- +<?php +include "php_cli_server.inc"; + +$proc_handle = php_cli_server_start(<<<PHP +http_response_code(308); +PHP +); + +list($host, $port) = explode(':', PHP_CLI_SERVER_ADDRESS); +$port = intval($port)?:80; + +$fp = fsockopen($host, $port, $errno, $errstr, 0.5); +if (!$fp) { + die("connect failed"); +} + +if(fwrite($fp, <<<HEADER +GET / HTTP/1.1 + + +HEADER +)) { + while (!feof($fp)) { + echo fgets($fp); + } +} + +fclose($fp); +?> +--EXPECTF-- +HTTP/1.1 308 Permanent Redirect +Date: %s +Connection: close +X-Powered-By: %s +Content-type: text/html; charset=UTF-8 diff --git a/sapi/cli/tests/bug67429_2.phpt b/sapi/cli/tests/bug67429_2.phpt new file mode 100644 index 0000000000..77447686a4 --- /dev/null +++ b/sapi/cli/tests/bug67429_2.phpt @@ -0,0 +1,42 @@ +--TEST-- +FR #67429 (CLI server is missing some new HTTP response codes) +--SKIPIF-- +<?php +include "skipif.inc"; +?> +--FILE-- +<?php +include "php_cli_server.inc"; + +$proc_handle = php_cli_server_start(<<<PHP +http_response_code(426); +PHP +); + +list($host, $port) = explode(':', PHP_CLI_SERVER_ADDRESS); +$port = intval($port)?:80; + +$fp = fsockopen($host, $port, $errno, $errstr, 0.5); +if (!$fp) { + die("connect failed"); +} + +if(fwrite($fp, <<<HEADER +GET / HTTP/1.1 + + +HEADER +)) { + while (!feof($fp)) { + echo fgets($fp); + } +} + +fclose($fp); +?> +--EXPECTF-- +HTTP/1.1 426 Upgrade Required +Date: %s +Connection: close +X-Powered-By: %s +Content-type: text/html; charset=UTF-8 diff --git a/sapi/cli/tests/php_cli_server.inc b/sapi/cli/tests/php_cli_server.inc index 1f7091be5c..6421978a37 100644 --- a/sapi/cli/tests/php_cli_server.inc +++ b/sapi/cli/tests/php_cli_server.inc @@ -109,21 +109,4 @@ php_cli_server_start_error: return $handle; } - -function php_cli_server_stop($handle) { - $success = FALSE; - if ($handle) { - proc_terminate($handle); - /* Wait for server to shutdown */ - for ($i = 0; $i < 60; $i++) { - $status = proc_get_status($handle); - if (!($status && $status['running'])) { - $success = TRUE; - break; - } - usleep(50000); - } - } - return $success; -} ?> |