diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2020-04-08 17:10:20 +0200 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-04-08 17:10:20 +0200 |
commit | 132749122426ee21171b2b3caccfaf86e24b4adf (patch) | |
tree | aee964831d355653da3472cd48ba3c18c969486d /sapi | |
parent | 5317ea6d5753eb0d658fe81f815d17e304e9c804 (diff) | |
download | php-git-132749122426ee21171b2b3caccfaf86e24b4adf.tar.gz |
Add php_cli_server_connect() helper
To encapsulate the repeated fsockopen() code.
This gives us a chance to control the timeout in one place:
Raise it to one second.
Diffstat (limited to 'sapi')
33 files changed, 83 insertions, 251 deletions
diff --git a/sapi/cli/tests/bug43177.phpt b/sapi/cli/tests/bug43177.phpt index 87dc8927ff..2ab08228b9 100644 --- a/sapi/cli/tests/bug43177.phpt +++ b/sapi/cli/tests/bug43177.phpt @@ -35,15 +35,10 @@ php_cli_server_start(<<<'SCRIPT' SCRIPT ); -list($host, $port) = explode(':', PHP_CLI_SERVER_ADDRESS); -$port = intval($port)?:80; +$host = PHP_CLI_SERVER_HOSTNAME; foreach(array("parse", "fatal", "fatal2", "compile") as $url) { - $fp = fsockopen($host, $port, $errno, $errstr, 0.5); - if (!$fp) { - die("connect failed"); - } - + $fp = php_cli_server_connect(); if(fwrite($fp, <<<HEADER GET /$url HTTP/1.1 Host: {$host} diff --git a/sapi/cli/tests/bug61679.phpt b/sapi/cli/tests/bug61679.phpt index 3ba36d572c..77f7bdfc1e 100644 --- a/sapi/cli/tests/bug61679.phpt +++ b/sapi/cli/tests/bug61679.phpt @@ -12,13 +12,8 @@ echo "This should never echo"; 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"); -} +$host = PHP_CLI_SERVER_HOSTNAME; +$fp = php_cli_server_connect(); // Send a request with a fictitious request method, // I like smurfs, the smurf everything. diff --git a/sapi/cli/tests/bug61977.phpt b/sapi/cli/tests/bug61977.phpt index 1b29dea31b..b55c6a2e8f 100644 --- a/sapi/cli/tests/bug61977.phpt +++ b/sapi/cli/tests/bug61977.phpt @@ -17,9 +17,8 @@ $mimetypes = ['html', 'htm', 'svg', 'css', 'js', 'png', 'webm', 'ogv', 'ogg']; function test_mimetypes($mimetypes) { foreach ($mimetypes as $mimetype) { - list($host, $port) = explode(':', PHP_CLI_SERVER_ADDRESS); - $port = intval($port) ? : 80; - $fp = fsockopen($host, $port, $errno, $errstr, 0.5); + $host = PHP_CLI_SERVER_HOSTNAME; + $fp = php_cli_server_connect(); if (!$fp) die('Connect failed'); file_put_contents(__DIR__ . "/foo.{$mimetype}", ''); $header = <<<HEADER diff --git a/sapi/cli/tests/bug65066_100.phpt b/sapi/cli/tests/bug65066_100.phpt index 4203b7444c..33f71cbd8b 100644 --- a/sapi/cli/tests/bug65066_100.phpt +++ b/sapi/cli/tests/bug65066_100.phpt @@ -11,13 +11,8 @@ include "skipif.inc"; include "php_cli_server.inc"; php_cli_server_start('http_response_code(100);'); -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"); -} +$host = PHP_CLI_SERVER_HOSTNAME; +$fp = php_cli_server_connect(); if(fwrite($fp, <<<HEADER GET / HTTP/1.1 diff --git a/sapi/cli/tests/bug65066_422.phpt b/sapi/cli/tests/bug65066_422.phpt index e8b497e923..99827640a1 100644 --- a/sapi/cli/tests/bug65066_422.phpt +++ b/sapi/cli/tests/bug65066_422.phpt @@ -11,13 +11,8 @@ include "skipif.inc"; include "php_cli_server.inc"; php_cli_server_start('http_response_code(422);'); -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"); -} +$host = PHP_CLI_SERVER_HOSTNAME; +$fp = php_cli_server_connect(); if(fwrite($fp, <<<HEADER GET / HTTP/1.1 diff --git a/sapi/cli/tests/bug65066_511.phpt b/sapi/cli/tests/bug65066_511.phpt index 7e5548aadc..91042efed1 100644 --- a/sapi/cli/tests/bug65066_511.phpt +++ b/sapi/cli/tests/bug65066_511.phpt @@ -11,13 +11,8 @@ include "skipif.inc"; include "php_cli_server.inc"; php_cli_server_start('http_response_code(511);'); -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"); -} +$host = PHP_CLI_SERVER_HOSTNAME; +$fp = php_cli_server_connect(); if(fwrite($fp, <<<HEADER GET / HTTP/1.1 diff --git a/sapi/cli/tests/bug65633.phpt b/sapi/cli/tests/bug65633.phpt index 2e9f2796e8..7b247b5dae 100644 --- a/sapi/cli/tests/bug65633.phpt +++ b/sapi/cli/tests/bug65633.phpt @@ -12,13 +12,8 @@ var_dump($_COOKIE, $_SERVER['HTTP_FOO']); 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"); -} +$host = PHP_CLI_SERVER_HOSTNAME; +$fp = php_cli_server_connect(); if(fwrite($fp, <<<HEADER GET / HTTP/1.1 diff --git a/sapi/cli/tests/bug66606_2.phpt b/sapi/cli/tests/bug66606_2.phpt index d8bd6162a4..f96a02a5f7 100644 --- a/sapi/cli/tests/bug66606_2.phpt +++ b/sapi/cli/tests/bug66606_2.phpt @@ -11,13 +11,8 @@ include "skipif.inc"; include "php_cli_server.inc"; php_cli_server_start('var_dump($_SERVER["CONTENT_TYPE"], $_SERVER["CONTENT_LENGTH"])'); -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"); -} +$host = PHP_CLI_SERVER_HOSTNAME; +$fp = php_cli_server_connect(); if (fwrite($fp, <<<HEADER POST /index.php HTTP/1.1 diff --git a/sapi/cli/tests/bug66830.phpt b/sapi/cli/tests/bug66830.phpt index a53dbb8a20..ee27b1c6e0 100644 --- a/sapi/cli/tests/bug66830.phpt +++ b/sapi/cli/tests/bug66830.phpt @@ -12,13 +12,8 @@ header(' '); 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"); -} +$host = PHP_CLI_SERVER_HOSTNAME; +$fp = php_cli_server_connect(); if(fwrite($fp, <<<HEADER GET / HTTP/1.1 diff --git a/sapi/cli/tests/bug67429_1.phpt b/sapi/cli/tests/bug67429_1.phpt index 8f3d6c79bc..5b23818bdb 100644 --- a/sapi/cli/tests/bug67429_1.phpt +++ b/sapi/cli/tests/bug67429_1.phpt @@ -13,13 +13,8 @@ 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"); -} +$host = PHP_CLI_SERVER_HOSTNAME; +$fp = php_cli_server_connect(); if(fwrite($fp, <<<HEADER GET / HTTP/1.1 diff --git a/sapi/cli/tests/bug67429_2.phpt b/sapi/cli/tests/bug67429_2.phpt index 77447686a4..381c7af8e5 100644 --- a/sapi/cli/tests/bug67429_2.phpt +++ b/sapi/cli/tests/bug67429_2.phpt @@ -13,13 +13,8 @@ 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"); -} +$host = PHP_CLI_SERVER_HOSTNAME; +$fp = php_cli_server_connect(); if(fwrite($fp, <<<HEADER GET / HTTP/1.1 diff --git a/sapi/cli/tests/bug68745.phpt b/sapi/cli/tests/bug68745.phpt index 4cdfe0ae4e..e7bc49ac79 100644 --- a/sapi/cli/tests/bug68745.phpt +++ b/sapi/cli/tests/bug68745.phpt @@ -9,13 +9,8 @@ include "skipif.inc"; include "php_cli_server.inc"; php_cli_server_start('var_dump(count($_SERVER));', 'not-index.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"); -} +$host = PHP_CLI_SERVER_HOSTNAME; +$fp = php_cli_server_connect(); if(fwrite($fp, "GET www.example.com:80 HTTP/1.1\r\n\r\n")) { while (!feof($fp)) { diff --git a/sapi/cli/tests/bug70470.phpt b/sapi/cli/tests/bug70470.phpt index 1e05f184b4..077e253787 100644 --- a/sapi/cli/tests/bug70470.phpt +++ b/sapi/cli/tests/bug70470.phpt @@ -9,11 +9,7 @@ include "skipif.inc"; include "php_cli_server.inc"; php_cli_server_start("var_dump(getAllheaders());"); -$fp = fsockopen(PHP_CLI_SERVER_HOSTNAME, PHP_CLI_SERVER_PORT, $errno, $errmsg, 0.5); - -if (!$fp) { - die("connect failed: " . $errmsg); -} +$fp = php_cli_server_connect(); fwrite($fp, "GET / HTTP/1.1\r\n"); fwrite($fp, "Host: " . PHP_CLI_SERVER_HOSTNAME . "\r\n"); diff --git a/sapi/cli/tests/bug71005.phpt b/sapi/cli/tests/bug71005.phpt index 6a163d4639..70521dbaec 100644 --- a/sapi/cli/tests/bug71005.phpt +++ b/sapi/cli/tests/bug71005.phpt @@ -15,13 +15,8 @@ EOF; include "php_cli_server.inc"; php_cli_server_start($code); -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"); -} +$host = PHP_CLI_SERVER_HOSTNAME; +$fp = php_cli_server_connect(); if(fwrite($fp, <<<HEADER GET / HTTP/1.1 diff --git a/sapi/cli/tests/emptyheader.phpt b/sapi/cli/tests/emptyheader.phpt index 9529730e8b..f301108b72 100644 --- a/sapi/cli/tests/emptyheader.phpt +++ b/sapi/cli/tests/emptyheader.phpt @@ -9,11 +9,8 @@ include "skipif.inc"; include "php_cli_server.inc"; php_cli_server_start("var_dump(getAllheaders());"); -$fp = fsockopen(PHP_CLI_SERVER_HOSTNAME, PHP_CLI_SERVER_PORT, $errno, $errmsg, 0.5); - -if (!$fp) { - die("connect failed: " . $errmsg); -} +$host = PHP_CLI_SERVER_HOSTNAME; +$fp = php_cli_server_connect(); fwrite($fp, "GET / HTTP/1.1\r\nUser-Agent\r\nAccept: */*\r\nReferer:\r\nHi\r\n\r\n"); fflush($fp); diff --git a/sapi/cli/tests/php_cli_server.inc b/sapi/cli/tests/php_cli_server.inc index 679a55eed4..d5f28cbb54 100644 --- a/sapi/cli/tests/php_cli_server.inc +++ b/sapi/cli/tests/php_cli_server.inc @@ -1,7 +1,7 @@ <?php -define ("PHP_CLI_SERVER_HOSTNAME", "localhost"); -define ("PHP_CLI_SERVER_PORT", 8964); -define ("PHP_CLI_SERVER_ADDRESS", PHP_CLI_SERVER_HOSTNAME.":".PHP_CLI_SERVER_PORT); +define("PHP_CLI_SERVER_HOSTNAME", "localhost"); +define("PHP_CLI_SERVER_PORT", 8964); +define("PHP_CLI_SERVER_ADDRESS", PHP_CLI_SERVER_HOSTNAME.":".PHP_CLI_SERVER_PORT); function php_cli_server_start( ?string $code = 'echo "Hello world";', @@ -96,4 +96,14 @@ php_cli_server_start_error: return $handle; } + +function php_cli_server_connect() { + $timeout = 1.0; + $fp = fsockopen(PHP_CLI_SERVER_HOSTNAME, PHP_CLI_SERVER_PORT, $errno, $errstr, $timeout); + if (!$fp) { + die("connect failed"); + } + return $fp; +} + ?> diff --git a/sapi/cli/tests/php_cli_server_004.phpt b/sapi/cli/tests/php_cli_server_004.phpt index 9c93de3f92..d9c3b171f2 100644 --- a/sapi/cli/tests/php_cli_server_004.phpt +++ b/sapi/cli/tests/php_cli_server_004.phpt @@ -11,13 +11,8 @@ include "skipif.inc"; include "php_cli_server.inc"; php_cli_server_start('foreach($_SERVER as $k=>$v) { if (!strncmp($k, "HTTP", 4)) var_dump( $k . ":" . $v); }'); -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"); -} +$host = PHP_CLI_SERVER_HOSTNAME; +$fp = php_cli_server_connect(); if(fwrite($fp, <<<HEADER GET / HTTP/1.1 diff --git a/sapi/cli/tests/php_cli_server_005.phpt b/sapi/cli/tests/php_cli_server_005.phpt index f89245df11..2d62432270 100644 --- a/sapi/cli/tests/php_cli_server_005.phpt +++ b/sapi/cli/tests/php_cli_server_005.phpt @@ -9,13 +9,8 @@ include "skipif.inc"; include "php_cli_server.inc"; php_cli_server_start('var_dump($_FILES);'); -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"); -} +$host = PHP_CLI_SERVER_HOSTNAME; +$fp = php_cli_server_connect(); $post_data = <<<POST -----------------------------114782935826962 diff --git a/sapi/cli/tests/php_cli_server_006.phpt b/sapi/cli/tests/php_cli_server_006.phpt index ee851b0edd..68f2b9789e 100644 --- a/sapi/cli/tests/php_cli_server_006.phpt +++ b/sapi/cli/tests/php_cli_server_006.phpt @@ -9,13 +9,8 @@ include "skipif.inc"; include "php_cli_server.inc"; php_cli_server_start('var_dump($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"]);'); -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"); -} +$host = PHP_CLI_SERVER_HOSTNAME; +$fp = php_cli_server_connect(); if(fwrite($fp, <<<HEADER GET / HTTP/1.1 diff --git a/sapi/cli/tests/php_cli_server_007.phpt b/sapi/cli/tests/php_cli_server_007.phpt index 3e8fc5f48d..b120befa95 100644 --- a/sapi/cli/tests/php_cli_server_007.phpt +++ b/sapi/cli/tests/php_cli_server_007.phpt @@ -9,13 +9,8 @@ include "skipif.inc"; include "php_cli_server.inc"; php_cli_server_start('header(\'WWW-Authenticate: Digest realm="foo",qop="auth",nonce="XXXXX",opaque="'.md5("foo").'"\');'); -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"); -} +$host = PHP_CLI_SERVER_HOSTNAME; +$fp = php_cli_server_connect(); if(fwrite($fp, <<<HEADER GET / HTTP/1.1 diff --git a/sapi/cli/tests/php_cli_server_008.phpt b/sapi/cli/tests/php_cli_server_008.phpt index 2d9955c031..a6442e07eb 100644 --- a/sapi/cli/tests/php_cli_server_008.phpt +++ b/sapi/cli/tests/php_cli_server_008.phpt @@ -9,13 +9,8 @@ include "skipif.inc"; include "php_cli_server.inc"; php_cli_server_start('var_dump($_SERVER["SERVER_PROTOCOL"]);'); -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"); -} +$host = PHP_CLI_SERVER_HOSTNAME; +$fp = php_cli_server_connect(); if(fwrite($fp, <<<HEADER GET / HTTP/1.1 @@ -31,11 +26,7 @@ HEADER fclose($fp); -$fp = fsockopen($host, $port, $errno, $errstr, 0.5); -if (!$fp) { - die("connect failed"); -} - +$fp = php_cli_server_connect(); if(fwrite($fp, <<<HEADER GET / HTTP/1.0 diff --git a/sapi/cli/tests/php_cli_server_009.phpt b/sapi/cli/tests/php_cli_server_009.phpt index cb4a14cb08..988f484613 100644 --- a/sapi/cli/tests/php_cli_server_009.phpt +++ b/sapi/cli/tests/php_cli_server_009.phpt @@ -12,13 +12,8 @@ include "skipif.inc"; include "php_cli_server.inc"; php_cli_server_start('var_dump($_SERVER["PATH_INFO"]);', null); -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"); -} +$host = PHP_CLI_SERVER_HOSTNAME; +$fp = php_cli_server_connect(); if(fwrite($fp, <<<HEADER GET /foo/bar HTTP/1.1 @@ -34,11 +29,7 @@ HEADER fclose($fp); -$fp = fsockopen($host, $port, $errno, $errstr, 0.5); -if (!$fp) { - die("connect failed"); -} - +$fp = php_cli_server_connect(); if(fwrite($fp, <<<HEADER GET /foo/bar/ HTTP/1.0 @@ -54,11 +45,7 @@ HEADER fclose($fp); -$fp = fsockopen($host, $port, $errno, $errstr, 0.5); -if (!$fp) { - die("connect failed"); -} - +$fp = php_cli_server_connect(); if(fwrite($fp, <<<HEADER GET /foo/bar.js HTTP/1.0 diff --git a/sapi/cli/tests/php_cli_server_010.phpt b/sapi/cli/tests/php_cli_server_010.phpt index 22cf3de344..b3b18498b3 100644 --- a/sapi/cli/tests/php_cli_server_010.phpt +++ b/sapi/cli/tests/php_cli_server_010.phpt @@ -9,13 +9,8 @@ include "skipif.inc"; include "php_cli_server.inc"; php_cli_server_start('var_dump($_SERVER["PHP_SELF"], $_SERVER["SCRIPT_NAME"], $_SERVER["PATH_INFO"], $_SERVER["QUERY_STRING"]);', null); -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"); -} +$host = PHP_CLI_SERVER_HOSTNAME; +$fp = php_cli_server_connect(); if(fwrite($fp, <<<HEADER GET /foo/bar?foo=bar HTTP/1.1 @@ -31,11 +26,7 @@ HEADER fclose($fp); -$fp = fsockopen($host, $port, $errno, $errstr, 0.5); -if (!$fp) { - die("connect failed"); -} - +$fp = php_cli_server_connect(); if(fwrite($fp, <<<HEADER GET /index.php/foo/bar/?foo=bar HTTP/1.0 diff --git a/sapi/cli/tests/php_cli_server_012.phpt b/sapi/cli/tests/php_cli_server_012.phpt index d60d71b02a..8796bd6fa2 100644 --- a/sapi/cli/tests/php_cli_server_012.phpt +++ b/sapi/cli/tests/php_cli_server_012.phpt @@ -11,13 +11,8 @@ php_cli_server_start('print_r($_REQUEST); $_REQUEST["foo"] = "bar"; return FALSE $doc_root = __DIR__; file_put_contents($doc_root . '/request.php', '<?php print_r($_REQUEST); ?>'); -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"); -} +$host = PHP_CLI_SERVER_HOSTNAME; +$fp = php_cli_server_connect(); if(fwrite($fp, <<<HEADER POST /request.php HTTP/1.1 diff --git a/sapi/cli/tests/php_cli_server_013.phpt b/sapi/cli/tests/php_cli_server_013.phpt index ec8957c8d1..09faa1cc0f 100644 --- a/sapi/cli/tests/php_cli_server_013.phpt +++ b/sapi/cli/tests/php_cli_server_013.phpt @@ -9,15 +9,10 @@ include "skipif.inc"; include "php_cli_server.inc"; php_cli_server_start(NULL, NULL); -list($host, $port) = explode(':', PHP_CLI_SERVER_ADDRESS); -$port = intval($port)?:80; $output = ''; -$fp = fsockopen($host, $port, $errno, $errstr, 0.5); -if (!$fp) { - die("connect failed"); -} - +$host = PHP_CLI_SERVER_HOSTNAME; +$fp = php_cli_server_connect(); if(fwrite($fp, <<<HEADER POST / HTTP/1.1 @@ -38,10 +33,7 @@ fclose($fp); $output = ''; -$fp = fsockopen($host, $port, $errno, $errstr, 0.5); -if (!$fp) { - die("connect failed"); -} +$fp = php_cli_server_connect(); if(fwrite($fp, <<<HEADER GET /main/style.css HTTP/1.1 @@ -59,10 +51,7 @@ echo preg_replace("/<style>(.*?)<\/style>/s", "<style>AAA</style>", $output), "\ fclose($fp); $output = ''; -$fp = fsockopen($host, $port, $errno, $errstr, 0.5); -if (!$fp) { - die("connect failed"); -} +$fp = php_cli_server_connect(); if(fwrite($fp, <<<HEADER HEAD /main/foo/bar HTTP/1.1 diff --git a/sapi/cli/tests/php_cli_server_014.phpt b/sapi/cli/tests/php_cli_server_014.phpt index 11db82ce90..1106c800e8 100644 --- a/sapi/cli/tests/php_cli_server_014.phpt +++ b/sapi/cli/tests/php_cli_server_014.phpt @@ -9,18 +9,9 @@ include "skipif.inc"; include "php_cli_server.inc"; php_cli_server_start('echo "done\n";', null); -list($host, $port) = explode(':', PHP_CLI_SERVER_ADDRESS); -$port = intval($port)?:80; $output = ''; - -// note: select() on Windows (& some other platforms) has historical issues with -// timeouts less than 1000 millis(0.5). it may be better to increase these -// timeouts to 1000 millis(1.0) (fsockopen eventually calls select()). -// see articles like: http://support.microsoft.com/kb/257821 -$fp = fsockopen($host, $port, $errno, $errstr, 0.5); -if (!$fp) { - die("connect failed"); -} +$host = PHP_CLI_SERVER_HOSTNAME; +$fp = php_cli_server_connect(); if(fwrite($fp, <<<HEADER POST /index.php HTTP/1.1 @@ -40,7 +31,7 @@ HEADER fclose($fp); -$fp = fsockopen($host, $port, $errno, $errstr, 0.5); +$fp = php_cli_server_connect(); if(fwrite($fp, <<<HEADER POST /main/no-exists.php HTTP/1.1 Host: {$host} diff --git a/sapi/cli/tests/php_cli_server_015.phpt b/sapi/cli/tests/php_cli_server_015.phpt index 990a3db97e..dc0e50ab15 100644 --- a/sapi/cli/tests/php_cli_server_015.phpt +++ b/sapi/cli/tests/php_cli_server_015.phpt @@ -14,14 +14,9 @@ $dir = realpath(__DIR__); file_put_contents($dir . "/syntax_error.php", "<?php non_exists_function(); ?>"); -list($host, $port) = explode(':', PHP_CLI_SERVER_ADDRESS); -$port = intval($port)?:80; $output = ''; - -$fp = fsockopen($host, $port, $errno, $errstr, 0.5); -if (!$fp) { - die("connect failed"); -} +$host = PHP_CLI_SERVER_HOSTNAME; +$fp = php_cli_server_connect(); if(fwrite($fp, <<<HEADER GET /index.php HTTP/1.1 diff --git a/sapi/cli/tests/php_cli_server_016.phpt b/sapi/cli/tests/php_cli_server_016.phpt index ae1d3f272a..d56cef4a64 100644 --- a/sapi/cli/tests/php_cli_server_016.phpt +++ b/sapi/cli/tests/php_cli_server_016.phpt @@ -19,13 +19,8 @@ else { 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"); -} +$host = PHP_CLI_SERVER_HOSTNAME; +$fp = php_cli_server_connect(); if(fwrite($fp, <<<HEADER POST /no-exists.jpg HTTP/1.1 diff --git a/sapi/cli/tests/php_cli_server_017.phpt b/sapi/cli/tests/php_cli_server_017.phpt index 067d504800..22d62c3b5e 100644 --- a/sapi/cli/tests/php_cli_server_017.phpt +++ b/sapi/cli/tests/php_cli_server_017.phpt @@ -12,13 +12,8 @@ var_dump($_SERVER['SCRIPT_FILENAME']); 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"); -} +$host = PHP_CLI_SERVER_HOSTNAME; +$fp = php_cli_server_connect(); if(fwrite($fp, <<<HEADER POST / HTTP/1.1 diff --git a/sapi/cli/tests/php_cli_server_018.phpt b/sapi/cli/tests/php_cli_server_018.phpt index acfb0f2ce3..9ed16c1395 100644 --- a/sapi/cli/tests/php_cli_server_018.phpt +++ b/sapi/cli/tests/php_cli_server_018.phpt @@ -12,13 +12,8 @@ var_dump($_SERVER['REQUEST_METHOD']); 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"); -} +$host = PHP_CLI_SERVER_HOSTNAME; +$fp = php_cli_server_connect(); if(fwrite($fp, <<<HEADER PATCH / HTTP/1.1 diff --git a/sapi/cli/tests/php_cli_server_019.phpt b/sapi/cli/tests/php_cli_server_019.phpt index 7be87a86c9..ce74c79535 100644 --- a/sapi/cli/tests/php_cli_server_019.phpt +++ b/sapi/cli/tests/php_cli_server_019.phpt @@ -15,13 +15,8 @@ var_dump(apache_response_headers()); 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"); -} +$host = PHP_CLI_SERVER_HOSTNAME; +$fp = php_cli_server_connect(); if(fwrite($fp, <<<HEADER GET / HTTP/1.1 diff --git a/sapi/cli/tests/php_cli_server_020.phpt b/sapi/cli/tests/php_cli_server_020.phpt index 23a8bc40e1..eb2a255a09 100644 --- a/sapi/cli/tests/php_cli_server_020.phpt +++ b/sapi/cli/tests/php_cli_server_020.phpt @@ -9,13 +9,8 @@ include "skipif.inc"; include "php_cli_server.inc"; php_cli_server_start('var_dump($_SERVER["REQUEST_METHOD"]);'); -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"); -} +$host = PHP_CLI_SERVER_HOSTNAME; +$fp = php_cli_server_connect(); if(fwrite($fp, <<<HEADER SEARCH / HTTP/1.1 diff --git a/sapi/cli/tests/upload_2G.phpt b/sapi/cli/tests/upload_2G.phpt index 82bbbca481..6ac1bbf0aa 100644 --- a/sapi/cli/tests/upload_2G.phpt +++ b/sapi/cli/tests/upload_2G.phpt @@ -46,15 +46,11 @@ include "php_cli_server.inc"; php_cli_server_start("var_dump(\$_FILES);", null, ["-d", "post_max_size=3G", "-d", "upload_max_filesize=3G"]); -list($host, $port) = explode(':', PHP_CLI_SERVER_ADDRESS); -$port = intval($port)?:80; $length = 2150000000; $output = ""; -$fp = fsockopen($host, $port, $errno, $errstr, 0.5); -if (!$fp) { - die("connect failed"); -} +$host = PHP_CLI_SERVER_HOSTNAME; +$fp = php_cli_server_connect(); $prev = "----123 Content-Type: text/plain; charset=UTF-8 |