[4.0] 26546ec varnishtest txresp reason phrase 'Ok' -> 'OK'

Dag Haavi Finstad daghf at varnish-software.com
Tue Jun 24 11:31:38 CEST 2014


commit 26546ec34d101ce0e8bd3ffbeb51e7af5af77f4b
Author: Dag Haavi Finstad <daghf at varnish-software.com>
Date:   Wed Apr 23 16:39:34 2014 +0200

    varnishtest txresp reason phrase 'Ok' -> 'OK'

diff --git a/bin/varnishtest/tests/a00001.vtc b/bin/varnishtest/tests/a00001.vtc
index 04106fe..d842287 100644
--- a/bin/varnishtest/tests/a00001.vtc
+++ b/bin/varnishtest/tests/a00001.vtc
@@ -15,7 +15,7 @@ client c1 -connect ${s1_sock} {
 	rxresp
 	expect resp.proto == HTTP/1.1
 	expect resp.status == 200
-	expect resp.msg == Ok
+	expect resp.msg == OK
 }
 
 client c1 -run
diff --git a/bin/varnishtest/tests/a00003.vtc b/bin/varnishtest/tests/a00003.vtc
index f928a42..810da48 100644
--- a/bin/varnishtest/tests/a00003.vtc
+++ b/bin/varnishtest/tests/a00003.vtc
@@ -32,7 +32,7 @@ client c2 -connect ${s2_sock} {
 	rxresp
 	expect resp.proto == HTTP/1.1
 	expect resp.status == 200
-	expect resp.msg == Ok
+	expect resp.msg == OK
 }
 
 client c1 -start
diff --git a/bin/varnishtest/tests/a00005.vtc b/bin/varnishtest/tests/a00005.vtc
index fcf4e58..6c0d634 100644
--- a/bin/varnishtest/tests/a00005.vtc
+++ b/bin/varnishtest/tests/a00005.vtc
@@ -34,7 +34,7 @@ client c1 -connect ${s2_sock} {
 	rxresp
 	expect resp.proto == HTTP/1.1
 	expect resp.status == 200
-	expect resp.msg == Ok
+	expect resp.msg == OK
 }
 
 client c1 -run
diff --git a/bin/varnishtest/tests/b00007.vtc b/bin/varnishtest/tests/b00007.vtc
index a48fa3f..02babe7 100644
--- a/bin/varnishtest/tests/b00007.vtc
+++ b/bin/varnishtest/tests/b00007.vtc
@@ -3,7 +3,7 @@ varnishtest "Check chunked encoding from backend works"
 server s1 {
 	rxreq
 	expect req.url == "/bar"
-	send "HTTP/1.1 200 Ok\r\n"
+	send "HTTP/1.1 200 OK\r\n"
 	send "Transfer-encoding: chunked\r\n"
 	send "\r\n"
 	send "00000004\r\n1234\r\n"
@@ -12,7 +12,7 @@ server s1 {
 
 	rxreq
 	expect req.url == "/foo"
-	send "HTTP/1.1 200 Ok\r\n"
+	send "HTTP/1.1 200 OK\r\n"
 	send "Transfer-encoding: chunked\r\n"
 	send "\r\n"
 	send "00000004\r\n1234\r\n"
diff --git a/bin/varnishtest/tests/b00011.vtc b/bin/varnishtest/tests/b00011.vtc
index bbd8cb3..82381a8 100644
--- a/bin/varnishtest/tests/b00011.vtc
+++ b/bin/varnishtest/tests/b00011.vtc
@@ -2,7 +2,7 @@ varnishtest "Check HTTP/1.0 EOF transmission"
 
 server s1 {
 	rxreq
-	send "HTTP/1.1 200 Ok\n"
+	send "HTTP/1.1 200 OK\n"
 	send "Connection: close\n"
 	send "\n"
 	send "Body line 1\n"
diff --git a/bin/varnishtest/tests/b00020.vtc b/bin/varnishtest/tests/b00020.vtc
index 20bc72b..1448ed5 100644
--- a/bin/varnishtest/tests/b00020.vtc
+++ b/bin/varnishtest/tests/b00020.vtc
@@ -4,7 +4,7 @@ feature SO_RCVTIMEO_WORKS
 
 server s1 {
 	rxreq
-	send "HTTP/1.1 200 Ok\r\nConnection: close\r\n\r\n"
+	send "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\n"
 	delay 1.5
 	# send "Baba\n"
 } -start
@@ -29,7 +29,7 @@ varnish v1 -expect n_objectcore == 0
 
 server s1 -wait {
 	rxreq
-	send "HTTP/1.1 200 Ok\r\nConnection: close\r\n\r\n"
+	send "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\n"
 	delay 0.5
 	send "Baba\n"
 	delay 0.5
diff --git a/bin/varnishtest/tests/b00021.vtc b/bin/varnishtest/tests/b00021.vtc
index 5646183..3d4e241 100644
--- a/bin/varnishtest/tests/b00021.vtc
+++ b/bin/varnishtest/tests/b00021.vtc
@@ -4,7 +4,7 @@ feature SO_RCVTIMEO_WORKS
 
 server s1 {
 	rxreq
-	send "HTTP/1.1 200 Ok\r\nConnection: close\r\n\r\n"
+	send "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\n"
 	delay 4.0
 	send "Baba\n"
 } -start
@@ -26,7 +26,7 @@ client c1 {
 
 server s1 {
 	rxreq
-	send "HTTP/1.1 200 Ok\r\nConnection: close\r\n\r\n"
+	send "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\n"
 	delay 1.0
 	send "Baba\n"
 	delay 1.0
diff --git a/bin/varnishtest/tests/b00022.vtc b/bin/varnishtest/tests/b00022.vtc
index 2201586..c232408 100644
--- a/bin/varnishtest/tests/b00022.vtc
+++ b/bin/varnishtest/tests/b00022.vtc
@@ -4,7 +4,7 @@ feature SO_RCVTIMEO_WORKS
 
 server s1 {
 	rxreq
-	send "HTTP/1.1 200 Ok\r\nConnection: close\r\n\r\n"
+	send "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\n"
 	delay 1.5
 	send "Baba\n"
 } -start
@@ -28,7 +28,7 @@ client c1 {
 
 server s1 {
 	rxreq
-	send "HTTP/1.1 200 Ok\r\nConnection: close\r\n\r\n"
+	send "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\n"
 	delay 0.5
 	send "Baba\n"
 	delay 0.5
diff --git a/bin/varnishtest/tests/b00027.vtc b/bin/varnishtest/tests/b00027.vtc
index f1907c0..e067475 100644
--- a/bin/varnishtest/tests/b00027.vtc
+++ b/bin/varnishtest/tests/b00027.vtc
@@ -6,7 +6,7 @@ server s1 {
 	rxreq
 	txresp -proto HTTP/1.0 -hdr "Connection: keep-alive"
 	rxreq
-	send "HTTP/1.1 200 Ok\n"
+	send "HTTP/1.1 200 OK\n"
 	send "Transfer-encoding: foobar\n"
 	send "\n"
 } -start
diff --git a/bin/varnishtest/tests/c00013.vtc b/bin/varnishtest/tests/c00013.vtc
index b9578aa..081ed1f 100644
--- a/bin/varnishtest/tests/c00013.vtc
+++ b/bin/varnishtest/tests/c00013.vtc
@@ -3,7 +3,7 @@ varnishtest "Test parking second request on backend delay"
 server s1 {
 	rxreq
 	expect req.url == "/foo"
-	send "HTTP/1.1 200 Ok\r\nConnection: close\r\n\r\n"
+	send "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\n"
 	delay .2
 	sema r1 sync 2
 	delay .2
diff --git a/bin/varnishtest/tests/c00014.vtc b/bin/varnishtest/tests/c00014.vtc
index fffbbd7..99f2dd7 100644
--- a/bin/varnishtest/tests/c00014.vtc
+++ b/bin/varnishtest/tests/c00014.vtc
@@ -4,7 +4,7 @@ server s1 {
 	rxreq
 	expect req.url == "/foo"
 	sema r1 sync 2
-	send "HTTP/1.1 200 Ok\r\nContent-Length: 12\r\n\r\n"
+	send "HTTP/1.1 200 OK\r\nContent-Length: 12\r\n\r\n"
 	send "line1\n"
 	send "line2\n"
 
diff --git a/bin/varnishtest/tests/c00066.vtc b/bin/varnishtest/tests/c00066.vtc
index eeb1ff9..18a9b67 100644
--- a/bin/varnishtest/tests/c00066.vtc
+++ b/bin/varnishtest/tests/c00066.vtc
@@ -43,7 +43,7 @@ client c1 {
 	txreq -url "/"
 	rxresp
 	expect resp.status == 200
-	expect resp.msg == "Ok"
+	expect resp.msg == "OK"
 
 	txreq -url "/synth"
 	rxresp
diff --git a/bin/varnishtest/tests/e00007.vtc b/bin/varnishtest/tests/e00007.vtc
index 519759c..a03ef55 100644
--- a/bin/varnishtest/tests/e00007.vtc
+++ b/bin/varnishtest/tests/e00007.vtc
@@ -16,7 +16,7 @@ varnishtest "ESI spanning storage bits"
 server s1 {
 	rxreq
 	expect req.url == "/foo/bar"
-	send "HTTP/1.1 200 Ok\n"
+	send "HTTP/1.1 200 OK\n"
 	send "Connection: close\n"
 	send "\n"
 	send {
diff --git a/bin/varnishtest/tests/e00014.vtc b/bin/varnishtest/tests/e00014.vtc
index 7021c95..ec6d16b 100644
--- a/bin/varnishtest/tests/e00014.vtc
+++ b/bin/varnishtest/tests/e00014.vtc
@@ -3,7 +3,7 @@ varnishtest "Check <esi: detector"
 server s1 {
         rxreq
         expect req.url == "/foo"
-	send "HTTP/1.1 200 Ok\n"
+	send "HTTP/1.1 200 OK\n"
         send "Connection: close\n"
 	send "\n"
         send {           <a>   <esi/>                          }
diff --git a/bin/varnishtest/tests/l00002.vtc b/bin/varnishtest/tests/l00002.vtc
index 8c7bc35..72faa08 100644
--- a/bin/varnishtest/tests/l00002.vtc
+++ b/bin/varnishtest/tests/l00002.vtc
@@ -28,7 +28,7 @@ varnish v1 -vcl+backend {
 # \r\n				  2 bytes
 # Total:			 38 bytes
 # Response:
-# HTTP/1.1 200 Ok\r\n		 17 bytes
+# HTTP/1.1 200 OK\r\n		 17 bytes
 # Content-Length: 1000\r\n	 22 bytes
 # Connection: keep-alive\r\n	 24 bytes
 # Accept-Ranges: bytes\r\n	 22 bytes
@@ -40,7 +40,7 @@ varnish v1 -vcl+backend {
 # \r\n				  2 bytes
 # Total:			 19 bytes
 # Response:
-# HTTP/1.1 200 Ok\r\n		 17 bytes
+# HTTP/1.1 200 OK\r\n		 17 bytes
 # Content-Length: 2000\r\n	 22 bytes
 # Connection: keep-alive\r\n	 24 bytes
 # Accept-Ranges: bytes\r\n	 22 bytes
@@ -52,7 +52,7 @@ varnish v1 -vcl+backend {
 # \r\n				  2 bytes
 # Total:			 19 bytes
 # Response:
-# HTTP/1.1 200 Ok\r\n		 17 bytes
+# HTTP/1.1 200 OK\r\n		 17 bytes
 # Content-Length: 2000\r\n	 22 bytes
 # Connection: keep-alive\r\n	 24 bytes
 # Accept-Ranges: bytes\r\n	 22 bytes
diff --git a/bin/varnishtest/tests/l00003.vtc b/bin/varnishtest/tests/l00003.vtc
index cb03a18..86c9e2a 100644
--- a/bin/varnishtest/tests/l00003.vtc
+++ b/bin/varnishtest/tests/l00003.vtc
@@ -32,7 +32,7 @@ varnish v1 -vcl+backend {
 # Total:				18 bytes
 
 # Reponse:
-# HTTP/1.1 200 Ok\r\n			17 bytes
+# HTTP/1.1 200 OK\r\n			17 bytes
 # Transfer-Encoding: chunked\r\n	28 bytes
 # Connection: keep-alive\r\n		24 bytes
 # \r\n					 2 bytes
diff --git a/bin/varnishtest/tests/l00004.vtc b/bin/varnishtest/tests/l00004.vtc
index 3b07e36..22e5ea3 100644
--- a/bin/varnishtest/tests/l00004.vtc
+++ b/bin/varnishtest/tests/l00004.vtc
@@ -37,7 +37,7 @@ varnish v1 -vcl+backend {
 # asdf					 4 bytes
 
 # resp:
-# HTTP/1.1 200 Ok\r\n			17 bytes
+# HTTP/1.1 200 OK\r\n			17 bytes
 # Content-Length: 4\r\n			19 bytes
 # \r\n					 2 bytes
 # fdsa					 4 bytes
diff --git a/bin/varnishtest/tests/l00005.vtc b/bin/varnishtest/tests/l00005.vtc
index dbbea1b..e7472ff 100644
--- a/bin/varnishtest/tests/l00005.vtc
+++ b/bin/varnishtest/tests/l00005.vtc
@@ -28,7 +28,7 @@ varnish v1 -vcl+backend {
 # \r\n				  2 bytes
 # Total:			 54 bytes
 # Response:
-# HTTP/1.1 200 Ok\r\n		 17 bytes
+# HTTP/1.1 200 OK\r\n		 17 bytes
 # Content-Length: 1000\r\n	 22 bytes
 # \r\n				  2 bytes
 # Total:			 41 bytes
diff --git a/bin/varnishtest/tests/p00007.vtc b/bin/varnishtest/tests/p00007.vtc
index ca6d04d..5fd9e9e 100644
--- a/bin/varnishtest/tests/p00007.vtc
+++ b/bin/varnishtest/tests/p00007.vtc
@@ -3,7 +3,7 @@ varnishtest "test reload of object spanning incomplete segment"
 server s1 {
 	rxreq
 	expect req.url == "/1"
-	send "HTTP/1.1 200 Ok\n"
+	send "HTTP/1.1 200 OK\n"
 	send "Transfer-encoding: chunked\n"
 	send "\n"
 	chunkedlen 32
diff --git a/bin/varnishtest/tests/r00387.vtc b/bin/varnishtest/tests/r00387.vtc
index 5edb18a..57ec219 100644
--- a/bin/varnishtest/tests/r00387.vtc
+++ b/bin/varnishtest/tests/r00387.vtc
@@ -3,7 +3,7 @@ varnishtest "Regression test for #387: too long chunk header"
 server s1 {
 	rxreq
 	non-fatal
-	send "HTTP/1.1 200 Ok\r\n"
+	send "HTTP/1.1 200 OK\r\n"
 	send "Transfer-encoding: chunked\r\n"
 	send "\r\n"
 	send "004\r\n1234\r\n"
diff --git a/bin/varnishtest/tests/r00694.vtc b/bin/varnishtest/tests/r00694.vtc
index da2d9a5..a28f4f1 100644
--- a/bin/varnishtest/tests/r00694.vtc
+++ b/bin/varnishtest/tests/r00694.vtc
@@ -2,7 +2,7 @@ varnishtest "Wrong calculation of last storage segment length"
 
 server s1 {
 	rxreq
-	send "HTTP/1.1 200 Ok\r\n"
+	send "HTTP/1.1 200 OK\r\n"
 	send "Transfer-encoding: chunked\r\n"
 	send "\r\n"
 	# This is chunksize (128k) + 2 to force to chunks to be allocated
diff --git a/bin/varnishtest/tests/r00733.vtc b/bin/varnishtest/tests/r00733.vtc
index 4d6dd05..365f0ec 100644
--- a/bin/varnishtest/tests/r00733.vtc
+++ b/bin/varnishtest/tests/r00733.vtc
@@ -2,7 +2,7 @@ varnishtest "HTTP/1.1 Backend sends no length hint"
 
 server s1 {
 	rxreq
-	send "HTTP/1.1 200 Ok\n"
+	send "HTTP/1.1 200 OK\n"
 	send "\n"
 	send "12345"
 } -start
diff --git a/bin/varnishtest/tests/r01419.vtc b/bin/varnishtest/tests/r01419.vtc
index 5165c63..a47d424 100644
--- a/bin/varnishtest/tests/r01419.vtc
+++ b/bin/varnishtest/tests/r01419.vtc
@@ -2,7 +2,7 @@ varnishtest "Make sure banlurker skips busy objects"
 
 server s1 {
 	rxreq
-	send "HTTP/1.0 200 Ok\r\n"
+	send "HTTP/1.0 200 OK\r\n"
 	sema r1 sync 2
 	send "Foobar: blaf\r\n"
 	send "Content-Length: 10\r\n"
diff --git a/bin/varnishtest/vtc_http.c b/bin/varnishtest/vtc_http.c
index 17dba6b..966f043 100644
--- a/bin/varnishtest/vtc_http.c
+++ b/bin/varnishtest/vtc_http.c
@@ -760,7 +760,7 @@ cmd_http_txresp(CMD_ARGS)
 	struct http *hp;
 	const char *proto = "HTTP/1.1";
 	const char *status = "200";
-	const char *msg = "Ok";
+	const char *msg = "OK";
 	char* body = NULL;
 
 	(void)cmd;



More information about the varnish-commit mailing list