From a3f5b9f62dcdca52caf804c81ac9ef21d7436261 Mon Sep 17 00:00:00 2001 From: Andrea Faulds Date: Tue, 22 Oct 2013 16:07:37 +0000 Subject: [PATCH] Rewrote test using tcp instead of http:// stream --- sapi/cli/tests/php_cli_server_019.phpt | 56 ++++++++++++++++++-------- 1 file changed, 39 insertions(+), 17 deletions(-) diff --git a/sapi/cli/tests/php_cli_server_019.phpt b/sapi/cli/tests/php_cli_server_019.phpt index 8001f51941..cdad01ed64 100644 --- a/sapi/cli/tests/php_cli_server_019.phpt +++ b/sapi/cli/tests/php_cli_server_019.phpt @@ -8,39 +8,61 @@ include "skipif.inc"; array( - 'method'=>"GET", - 'header'=>"Foo-Bar: bar\r\n" - ) -); +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, <<
--EXPECTF-- +HTTP/1.1 200 OK +Host: %s +Connection: close +X-Powered-By: %s +Bar-Foo: Foo +Content-type: text/html + array(2) { ["Host"]=> - string(%s) "%s:%s" + string(9) "localhost" ["Foo-Bar"]=> - string(3) "bar" + string(3) "Bar" } array(2) { ["Host"]=> - string(%s) "%s:%s" + string(9) "localhost" ["Foo-Bar"]=> - string(3) "bar" + string(3) "Bar" } -array(2) { +array(3) { ["X-Powered-By"]=> - string(%s) "PHP/%s" - ["Content-Type"]=> - string(10) "text/plain" + string(13) "P%s" + ["Bar-Foo"]=> + string(3) "Foo" + ["Content-type"]=> + string(9) "text/html" } -- 2.40.0