nikic Sat, 18 Feb 2012 11:59:13 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=323324
Log: Fix cli server tests broken by r323078 Needs to be merged to 5.4 after r323078 is merged. Changed paths: U php/php-src/trunk/sapi/cli/tests/php_cli_server_004.phpt U php/php-src/trunk/sapi/cli/tests/php_cli_server_005.phpt U php/php-src/trunk/sapi/cli/tests/php_cli_server_006.phpt U php/php-src/trunk/sapi/cli/tests/php_cli_server_007.phpt U php/php-src/trunk/sapi/cli/tests/php_cli_server_008.phpt U php/php-src/trunk/sapi/cli/tests/php_cli_server_009.phpt U php/php-src/trunk/sapi/cli/tests/php_cli_server_010.phpt U php/php-src/trunk/sapi/cli/tests/php_cli_server_012.phpt U php/php-src/trunk/sapi/cli/tests/php_cli_server_013.phpt U php/php-src/trunk/sapi/cli/tests/php_cli_server_014.phpt U php/php-src/trunk/sapi/cli/tests/php_cli_server_015.phpt Modified: php/php-src/trunk/sapi/cli/tests/php_cli_server_004.phpt =================================================================== --- php/php-src/trunk/sapi/cli/tests/php_cli_server_004.phpt 2012-02-18 11:27:34 UTC (rev 323323) +++ php/php-src/trunk/sapi/cli/tests/php_cli_server_004.phpt 2012-02-18 11:59:13 UTC (rev 323324) @@ -38,7 +38,7 @@ --EXPECTF-- HTTP/1.1 200 OK Host: %s -Connection: closed +Connection: close X-Powered-By: PHP/%s Content-type: text/html Modified: php/php-src/trunk/sapi/cli/tests/php_cli_server_005.phpt =================================================================== --- php/php-src/trunk/sapi/cli/tests/php_cli_server_005.phpt 2012-02-18 11:27:34 UTC (rev 323323) +++ php/php-src/trunk/sapi/cli/tests/php_cli_server_005.phpt 2012-02-18 11:59:13 UTC (rev 323324) @@ -50,7 +50,7 @@ --EXPECTF-- HTTP/1.1 200 OK Host: %s -Connection: closed +Connection: close X-Powered-By: PHP/%s Content-type: text/html Modified: php/php-src/trunk/sapi/cli/tests/php_cli_server_006.phpt =================================================================== --- php/php-src/trunk/sapi/cli/tests/php_cli_server_006.phpt 2012-02-18 11:27:34 UTC (rev 323323) +++ php/php-src/trunk/sapi/cli/tests/php_cli_server_006.phpt 2012-02-18 11:59:13 UTC (rev 323324) @@ -34,7 +34,7 @@ --EXPECTF-- HTTP/1.1 200 OK Host: %s -Connection: closed +Connection: close X-Powered-By: PHP/%s Content-type: text/html Modified: php/php-src/trunk/sapi/cli/tests/php_cli_server_007.phpt =================================================================== --- php/php-src/trunk/sapi/cli/tests/php_cli_server_007.phpt 2012-02-18 11:27:34 UTC (rev 323323) +++ php/php-src/trunk/sapi/cli/tests/php_cli_server_007.phpt 2012-02-18 11:59:13 UTC (rev 323324) @@ -34,7 +34,7 @@ --EXPECTF-- HTTP/1.1 401 Unauthorized Host: %s -Connection: closed +Connection: close X-Powered-By: PHP/%s WWW-Authenticate: Digest realm="foo",qop="auth",nonce="XXXXX",opaque="acbd18db4cc2f85cedef654fccc4a4d8" Content-type: text/html Modified: php/php-src/trunk/sapi/cli/tests/php_cli_server_008.phpt =================================================================== --- php/php-src/trunk/sapi/cli/tests/php_cli_server_008.phpt 2012-02-18 11:27:34 UTC (rev 323323) +++ php/php-src/trunk/sapi/cli/tests/php_cli_server_008.phpt 2012-02-18 11:59:13 UTC (rev 323324) @@ -54,14 +54,14 @@ --EXPECTF-- HTTP/1.1 200 OK Host: %s -Connection: closed +Connection: close X-Powered-By: PHP/%s Content-type: text/html string(8) "HTTP/1.1" HTTP/1.0 200 OK Host: %s -Connection: closed +Connection: close X-Powered-By: PHP/%s Content-type: text/html Modified: php/php-src/trunk/sapi/cli/tests/php_cli_server_009.phpt =================================================================== --- php/php-src/trunk/sapi/cli/tests/php_cli_server_009.phpt 2012-02-18 11:27:34 UTC (rev 323323) +++ php/php-src/trunk/sapi/cli/tests/php_cli_server_009.phpt 2012-02-18 11:59:13 UTC (rev 323324) @@ -78,14 +78,14 @@ --EXPECTF-- HTTP/1.1 200 OK Host: %s -Connection: closed +Connection: close X-Powered-By: PHP/%s Content-type: text/html string(8) "/foo/bar" HTTP/1.0 200 OK Host: %s -Connection: closed +Connection: close X-Powered-By: PHP/%s Content-type: text/html Modified: php/php-src/trunk/sapi/cli/tests/php_cli_server_010.phpt =================================================================== --- php/php-src/trunk/sapi/cli/tests/php_cli_server_010.phpt 2012-02-18 11:27:34 UTC (rev 323323) +++ php/php-src/trunk/sapi/cli/tests/php_cli_server_010.phpt 2012-02-18 11:59:13 UTC (rev 323324) @@ -55,7 +55,7 @@ --EXPECTF-- HTTP/1.1 200 OK Host: %s -Connection: closed +Connection: close X-Powered-By: PHP/%s Content-type: text/html @@ -65,7 +65,7 @@ string(7) "foo=bar" HTTP/1.0 200 OK Host: %s -Connection: closed +Connection: close X-Powered-By: PHP/%s Content-type: text/html Modified: php/php-src/trunk/sapi/cli/tests/php_cli_server_012.phpt =================================================================== --- php/php-src/trunk/sapi/cli/tests/php_cli_server_012.phpt 2012-02-18 11:27:34 UTC (rev 323323) +++ php/php-src/trunk/sapi/cli/tests/php_cli_server_012.phpt 2012-02-18 11:59:13 UTC (rev 323324) @@ -40,7 +40,7 @@ --EXPECTF-- HTTP/1.1 200 OK Host: %s -Connection: closed +Connection: close X-Powered-By: PHP/%s Content-type: text/html Modified: php/php-src/trunk/sapi/cli/tests/php_cli_server_013.phpt =================================================================== --- php/php-src/trunk/sapi/cli/tests/php_cli_server_013.phpt 2012-02-18 11:27:34 UTC (rev 323323) +++ php/php-src/trunk/sapi/cli/tests/php_cli_server_013.phpt 2012-02-18 11:59:13 UTC (rev 323324) @@ -83,7 +83,7 @@ HTTP/1.1 404 Not Found Host: %s -Connection: closed +Connection: close Content-Type: text/html; charset=UTF-8 Content-Length: %d @@ -91,7 +91,7 @@ </head><body><h1 class="h">Not Found</h1><p>The requested resource / was not found on this server.</p></body></html> HTTP/1.1 404 Not Found Host: %s -Connection: closed +Connection: close Content-Type: text/html; charset=UTF-8 Content-Length: %d @@ -99,7 +99,7 @@ </head><body><h1 class="h">Not Found</h1><p>The requested resource /main/style.css was not found on this server.</p></body></html> HTTP/1.1 404 Not Found Host: %s -Connection: closed +Connection: close Content-Type: text/html; charset=UTF-8 Content-Length: %d Modified: php/php-src/trunk/sapi/cli/tests/php_cli_server_014.phpt =================================================================== --- php/php-src/trunk/sapi/cli/tests/php_cli_server_014.phpt 2012-02-18 11:27:34 UTC (rev 323323) +++ php/php-src/trunk/sapi/cli/tests/php_cli_server_014.phpt 2012-02-18 11:59:13 UTC (rev 323324) @@ -61,14 +61,14 @@ HTTP/1.1 200 OK Host: %s -Connection: closed +Connection: close X-Powered-By: %s Content-type: %s done HTTP/1.1 404 Not Found Host: %s -Connection: closed +Connection: close Content-Type: %s Content-Length: %d Modified: php/php-src/trunk/sapi/cli/tests/php_cli_server_015.phpt =================================================================== --- php/php-src/trunk/sapi/cli/tests/php_cli_server_015.phpt 2012-02-18 11:27:34 UTC (rev 323323) +++ php/php-src/trunk/sapi/cli/tests/php_cli_server_015.phpt 2012-02-18 11:59:13 UTC (rev 323324) @@ -41,7 +41,7 @@ --EXPECTF-- HTTP/1.1 200 OK Host: %s -Connection: closed +Connection: close X-Powered-By: PHP/%s Content-type: text/html
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php