diff options
author | Nikita Popov <nikic@php.net> | 2012-02-18 11:59:13 +0000 |
---|---|---|
committer | Nikita Popov <nikic@php.net> | 2012-02-18 11:59:13 +0000 |
commit | 0a91432828521fdb4122b0663cb6cb9af64b53fa (patch) | |
tree | 39547f2e5c549662568b5fcb57054a3261741c7c /sapi | |
parent | 8bc24c004605d5dcf41652033f9be25038f1156e (diff) | |
download | php-git-0a91432828521fdb4122b0663cb6cb9af64b53fa.tar.gz |
Fix cli server tests broken by r323078
Needs to be merged to 5.4 after r323078 is merged.
Diffstat (limited to 'sapi')
-rw-r--r-- | sapi/cli/tests/php_cli_server_004.phpt | 2 | ||||
-rw-r--r-- | sapi/cli/tests/php_cli_server_005.phpt | 2 | ||||
-rw-r--r-- | sapi/cli/tests/php_cli_server_006.phpt | 2 | ||||
-rw-r--r-- | sapi/cli/tests/php_cli_server_007.phpt | 2 | ||||
-rw-r--r-- | sapi/cli/tests/php_cli_server_008.phpt | 4 | ||||
-rw-r--r-- | sapi/cli/tests/php_cli_server_009.phpt | 4 | ||||
-rw-r--r-- | sapi/cli/tests/php_cli_server_010.phpt | 4 | ||||
-rw-r--r-- | sapi/cli/tests/php_cli_server_012.phpt | 2 | ||||
-rw-r--r-- | sapi/cli/tests/php_cli_server_013.phpt | 6 | ||||
-rw-r--r-- | sapi/cli/tests/php_cli_server_014.phpt | 4 | ||||
-rw-r--r-- | sapi/cli/tests/php_cli_server_015.phpt | 2 |
11 files changed, 17 insertions, 17 deletions
diff --git a/sapi/cli/tests/php_cli_server_004.phpt b/sapi/cli/tests/php_cli_server_004.phpt index cb0d0604b8..b61f88637e 100644 --- a/sapi/cli/tests/php_cli_server_004.phpt +++ b/sapi/cli/tests/php_cli_server_004.phpt @@ -38,7 +38,7 @@ HEADER --EXPECTF-- HTTP/1.1 200 OK Host: %s -Connection: closed +Connection: close X-Powered-By: PHP/%s Content-type: text/html diff --git a/sapi/cli/tests/php_cli_server_005.phpt b/sapi/cli/tests/php_cli_server_005.phpt index aa8b045a88..ccc0f8f3ab 100644 --- a/sapi/cli/tests/php_cli_server_005.phpt +++ b/sapi/cli/tests/php_cli_server_005.phpt @@ -50,7 +50,7 @@ HEADER --EXPECTF-- HTTP/1.1 200 OK Host: %s -Connection: closed +Connection: close X-Powered-By: PHP/%s Content-type: text/html diff --git a/sapi/cli/tests/php_cli_server_006.phpt b/sapi/cli/tests/php_cli_server_006.phpt index d9f21d89bb..09e7ab07a5 100644 --- a/sapi/cli/tests/php_cli_server_006.phpt +++ b/sapi/cli/tests/php_cli_server_006.phpt @@ -34,7 +34,7 @@ HEADER --EXPECTF-- HTTP/1.1 200 OK Host: %s -Connection: closed +Connection: close X-Powered-By: PHP/%s Content-type: text/html diff --git a/sapi/cli/tests/php_cli_server_007.phpt b/sapi/cli/tests/php_cli_server_007.phpt index f355cedaf8..64d4df0ed7 100644 --- a/sapi/cli/tests/php_cli_server_007.phpt +++ b/sapi/cli/tests/php_cli_server_007.phpt @@ -34,7 +34,7 @@ HEADER --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 diff --git a/sapi/cli/tests/php_cli_server_008.phpt b/sapi/cli/tests/php_cli_server_008.phpt index b2a4be1dc1..2e68e24059 100644 --- a/sapi/cli/tests/php_cli_server_008.phpt +++ b/sapi/cli/tests/php_cli_server_008.phpt @@ -54,14 +54,14 @@ fclose($fp); --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 diff --git a/sapi/cli/tests/php_cli_server_009.phpt b/sapi/cli/tests/php_cli_server_009.phpt index e28e72edb7..2beaeedab6 100644 --- a/sapi/cli/tests/php_cli_server_009.phpt +++ b/sapi/cli/tests/php_cli_server_009.phpt @@ -78,14 +78,14 @@ fclose($fp); --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 diff --git a/sapi/cli/tests/php_cli_server_010.phpt b/sapi/cli/tests/php_cli_server_010.phpt index 17bfb3863b..2ef018b857 100644 --- a/sapi/cli/tests/php_cli_server_010.phpt +++ b/sapi/cli/tests/php_cli_server_010.phpt @@ -55,7 +55,7 @@ fclose($fp); --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(8) "/foo/bar" string(7) "foo=bar" HTTP/1.0 200 OK Host: %s -Connection: closed +Connection: close X-Powered-By: PHP/%s Content-type: text/html diff --git a/sapi/cli/tests/php_cli_server_012.phpt b/sapi/cli/tests/php_cli_server_012.phpt index 8d0f22ec7a..a7d908187b 100644 --- a/sapi/cli/tests/php_cli_server_012.phpt +++ b/sapi/cli/tests/php_cli_server_012.phpt @@ -40,7 +40,7 @@ fclose($fp); --EXPECTF-- HTTP/1.1 200 OK Host: %s -Connection: closed +Connection: close X-Powered-By: PHP/%s Content-type: text/html diff --git a/sapi/cli/tests/php_cli_server_013.phpt b/sapi/cli/tests/php_cli_server_013.phpt index caefdd48fa..18b7375b3f 100644 --- a/sapi/cli/tests/php_cli_server_013.phpt +++ b/sapi/cli/tests/php_cli_server_013.phpt @@ -83,7 +83,7 @@ fclose($fp); 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 @@ Content-Length: %d </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 @@ Content-Length: %d </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 diff --git a/sapi/cli/tests/php_cli_server_014.phpt b/sapi/cli/tests/php_cli_server_014.phpt index 4e95040b5f..4b56caa70f 100644 --- a/sapi/cli/tests/php_cli_server_014.phpt +++ b/sapi/cli/tests/php_cli_server_014.phpt @@ -61,14 +61,14 @@ fclose($fp); 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 diff --git a/sapi/cli/tests/php_cli_server_015.phpt b/sapi/cli/tests/php_cli_server_015.phpt index 9ee7c1b100..6fb0169244 100644 --- a/sapi/cli/tests/php_cli_server_015.phpt +++ b/sapi/cli/tests/php_cli_server_015.phpt @@ -41,7 +41,7 @@ fclose($fp); --EXPECTF-- HTTP/1.1 200 OK Host: %s -Connection: closed +Connection: close X-Powered-By: PHP/%s Content-type: text/html |