archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.4'

Browse source 
* PHP-7.4:
  Add php_cli_server_connect() helper
This commit is contained in:
Nikita Popov 2020-04-08 17:11:50 +02:00
commit b0d8f012f9
33 changed files with 83 additions and 251 deletions
Download patch file Download diff file Expand all files Collapse all files

9
sapi/cli/tests/bug43177.phpt
View file

@ -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}

9
sapi/cli/tests/bug61679.phpt
View file

@ -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.

5
sapi/cli/tests/bug61977.phpt
View file

@ -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

9
sapi/cli/tests/bug65066_100.phpt
View file

@ -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

9
sapi/cli/tests/bug65066_422.phpt
View file

@ -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

9
sapi/cli/tests/bug65066_511.phpt
View file

@ -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

9
sapi/cli/tests/bug65633.phpt
View file

@ -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

9
sapi/cli/tests/bug66606_2.phpt
View file

@ -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

9
sapi/cli/tests/bug66830.phpt
View file

@ -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

9
sapi/cli/tests/bug67429_1.phpt
View file

@ -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

9
sapi/cli/tests/bug67429_2.phpt
View file

@ -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

9
sapi/cli/tests/bug68745.phpt
View file

@ -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)) {

6
sapi/cli/tests/bug70470.phpt
View file

@ -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");

9
sapi/cli/tests/bug71005.phpt
View file

@ -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

7
sapi/cli/tests/emptyheader.phpt
View file

@ -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);

10
sapi/cli/tests/php_cli_server.inc
View file

@ -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;
}
?>

9
sapi/cli/tests/php_cli_server_004.phpt
View file

@ -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

9
sapi/cli/tests/php_cli_server_005.phpt
View file

@ -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

9
sapi/cli/tests/php_cli_server_006.phpt
View file

@ -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

9
sapi/cli/tests/php_cli_server_007.phpt
View file

@ -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

15
sapi/cli/tests/php_cli_server_008.phpt
View file

@ -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

21
sapi/cli/tests/php_cli_server_009.phpt
View file

@ -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

15
sapi/cli/tests/php_cli_server_010.phpt
View file

@ -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

9
sapi/cli/tests/php_cli_server_012.phpt
View file

@ -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

19
sapi/cli/tests/php_cli_server_013.phpt
View file

@ -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

15
sapi/cli/tests/php_cli_server_014.phpt
View file

@ -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}

9
sapi/cli/tests/php_cli_server_015.phpt
View file

@ -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

9
sapi/cli/tests/php_cli_server_016.phpt
View file

@ -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

9
sapi/cli/tests/php_cli_server_017.phpt
View file

@ -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

9
sapi/cli/tests/php_cli_server_018.phpt
View file

@ -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

9
sapi/cli/tests/php_cli_server_019.phpt
View file

@ -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

9
sapi/cli/tests/php_cli_server_020.phpt
View file

@ -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

8
sapi/cli/tests/upload_2G.phpt
View file

@ -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