Fix cli server tests broken by r323078

Needs to be merged to 5.4 after r323078 is merged.

diff --git a/sapi/cli/tests/php_cli_server_004.phpt b/sapi/cli/tests/php_cli_server_004.phpt
index cb0d0604b81ae333acaeade08c036218817606b4..b61f88637e8db562f25e2cb82d4b4b1a8cb3734b 100644 (file)
--- 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 aa8b045a88736ee33f1ac3b2a1475358d20537e6..ccc0f8f3ab05d0ea2e5cf573712c823e14b392e1 100644 (file)
--- 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 d9f21d89bb85024bb11d30ee79cd996956754206..09e7ab07a561a345e7c44190d7b5f7338961921c 100644 (file)
--- 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 f355cedaf86fb357c798cbbbe3e7421948d32560..64d4df0ed70000d7443a6525404181fb92484d59 100644 (file)
--- 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 b2a4be1dc1f46f13ddef3f690638347fc6b50ba0..2e68e2405937b84b1396ca3ab4f16e56cca79cb1 100644 (file)
--- 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 e28e72edb7d98ff8590ebe8d2872b6db5e877980..2beaeedab6be9fa6376111b13192552d0baddec5 100644 (file)
--- 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 17bfb3863b1489721e2ca4c15436fddac43c3560..2ef018b8579e6c2a522c9eaee6e6107f4804e7c7 100644 (file)
--- 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 8d0f22ec7a2241893c666a6e4914c99c611260aa..a7d908187b8d48f4e5052fd82ea1fc268a604268 100644 (file)
--- 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 caefdd48fa98ecd546fa4d8841dcfb6f9eecafbd..18b7375b3f0b70bea42ea1f30b0c9554beb89d07 100644 (file)
--- 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 4e95040b5fec464622c952852cfa14e842498c2d..4b56caa70fec61c33c068211ff362681c81df435 100644 (file)
--- 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 9ee7c1b10067ad643c9526ef8fa8608481f3f704..6fb016924401e0206b8ce6951dcd9df0cb1706d5 100644 (file)
--- 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