Commit 26546ec3 authored by Dag Haavi Finstad's avatar Dag Haavi Finstad

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

parent 35308a3c
...@@ -15,7 +15,7 @@ client c1 -connect ${s1_sock} { ...@@ -15,7 +15,7 @@ client c1 -connect ${s1_sock} {
rxresp rxresp
expect resp.proto == HTTP/1.1 expect resp.proto == HTTP/1.1
expect resp.status == 200 expect resp.status == 200
expect resp.msg == Ok expect resp.msg == OK
} }
client c1 -run client c1 -run
......
...@@ -32,7 +32,7 @@ client c2 -connect ${s2_sock} { ...@@ -32,7 +32,7 @@ client c2 -connect ${s2_sock} {
rxresp rxresp
expect resp.proto == HTTP/1.1 expect resp.proto == HTTP/1.1
expect resp.status == 200 expect resp.status == 200
expect resp.msg == Ok expect resp.msg == OK
} }
client c1 -start client c1 -start
......
...@@ -34,7 +34,7 @@ client c1 -connect ${s2_sock} { ...@@ -34,7 +34,7 @@ client c1 -connect ${s2_sock} {
rxresp rxresp
expect resp.proto == HTTP/1.1 expect resp.proto == HTTP/1.1
expect resp.status == 200 expect resp.status == 200
expect resp.msg == Ok expect resp.msg == OK
} }
client c1 -run client c1 -run
......
...@@ -3,7 +3,7 @@ varnishtest "Check chunked encoding from backend works" ...@@ -3,7 +3,7 @@ varnishtest "Check chunked encoding from backend works"
server s1 { server s1 {
rxreq rxreq
expect req.url == "/bar" 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 "Transfer-encoding: chunked\r\n"
send "\r\n" send "\r\n"
send "00000004\r\n1234\r\n" send "00000004\r\n1234\r\n"
...@@ -12,7 +12,7 @@ server s1 { ...@@ -12,7 +12,7 @@ server s1 {
rxreq rxreq
expect req.url == "/foo" 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 "Transfer-encoding: chunked\r\n"
send "\r\n" send "\r\n"
send "00000004\r\n1234\r\n" send "00000004\r\n1234\r\n"
......
...@@ -2,7 +2,7 @@ varnishtest "Check HTTP/1.0 EOF transmission" ...@@ -2,7 +2,7 @@ varnishtest "Check HTTP/1.0 EOF transmission"
server s1 { server s1 {
rxreq rxreq
send "HTTP/1.1 200 Ok\n" send "HTTP/1.1 200 OK\n"
send "Connection: close\n" send "Connection: close\n"
send "\n" send "\n"
send "Body line 1\n" send "Body line 1\n"
......
...@@ -4,7 +4,7 @@ feature SO_RCVTIMEO_WORKS ...@@ -4,7 +4,7 @@ feature SO_RCVTIMEO_WORKS
server s1 { server s1 {
rxreq 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 delay 1.5
# send "Baba\n" # send "Baba\n"
} -start } -start
...@@ -29,7 +29,7 @@ varnish v1 -expect n_objectcore == 0 ...@@ -29,7 +29,7 @@ varnish v1 -expect n_objectcore == 0
server s1 -wait { server s1 -wait {
rxreq 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 delay 0.5
send "Baba\n" send "Baba\n"
delay 0.5 delay 0.5
......
...@@ -4,7 +4,7 @@ feature SO_RCVTIMEO_WORKS ...@@ -4,7 +4,7 @@ feature SO_RCVTIMEO_WORKS
server s1 { server s1 {
rxreq 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 delay 4.0
send "Baba\n" send "Baba\n"
} -start } -start
...@@ -26,7 +26,7 @@ client c1 { ...@@ -26,7 +26,7 @@ client c1 {
server s1 { server s1 {
rxreq 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 delay 1.0
send "Baba\n" send "Baba\n"
delay 1.0 delay 1.0
......
...@@ -4,7 +4,7 @@ feature SO_RCVTIMEO_WORKS ...@@ -4,7 +4,7 @@ feature SO_RCVTIMEO_WORKS
server s1 { server s1 {
rxreq 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 delay 1.5
send "Baba\n" send "Baba\n"
} -start } -start
...@@ -28,7 +28,7 @@ client c1 { ...@@ -28,7 +28,7 @@ client c1 {
server s1 { server s1 {
rxreq 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 delay 0.5
send "Baba\n" send "Baba\n"
delay 0.5 delay 0.5
......
...@@ -6,7 +6,7 @@ server s1 { ...@@ -6,7 +6,7 @@ server s1 {
rxreq rxreq
txresp -proto HTTP/1.0 -hdr "Connection: keep-alive" txresp -proto HTTP/1.0 -hdr "Connection: keep-alive"
rxreq rxreq
send "HTTP/1.1 200 Ok\n" send "HTTP/1.1 200 OK\n"
send "Transfer-encoding: foobar\n" send "Transfer-encoding: foobar\n"
send "\n" send "\n"
} -start } -start
......
...@@ -3,7 +3,7 @@ varnishtest "Test parking second request on backend delay" ...@@ -3,7 +3,7 @@ varnishtest "Test parking second request on backend delay"
server s1 { server s1 {
rxreq rxreq
expect req.url == "/foo" 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 delay .2
sema r1 sync 2 sema r1 sync 2
delay .2 delay .2
......
...@@ -4,7 +4,7 @@ server s1 { ...@@ -4,7 +4,7 @@ server s1 {
rxreq rxreq
expect req.url == "/foo" expect req.url == "/foo"
sema r1 sync 2 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 "line1\n"
send "line2\n" send "line2\n"
......
...@@ -43,7 +43,7 @@ client c1 { ...@@ -43,7 +43,7 @@ client c1 {
txreq -url "/" txreq -url "/"
rxresp rxresp
expect resp.status == 200 expect resp.status == 200
expect resp.msg == "Ok" expect resp.msg == "OK"
txreq -url "/synth" txreq -url "/synth"
rxresp rxresp
......
...@@ -16,7 +16,7 @@ varnishtest "ESI spanning storage bits" ...@@ -16,7 +16,7 @@ varnishtest "ESI spanning storage bits"
server s1 { server s1 {
rxreq rxreq
expect req.url == "/foo/bar" expect req.url == "/foo/bar"
send "HTTP/1.1 200 Ok\n" send "HTTP/1.1 200 OK\n"
send "Connection: close\n" send "Connection: close\n"
send "\n" send "\n"
send { send {
......
...@@ -3,7 +3,7 @@ varnishtest "Check <esi: detector" ...@@ -3,7 +3,7 @@ varnishtest "Check <esi: detector"
server s1 { server s1 {
rxreq rxreq
expect req.url == "/foo" expect req.url == "/foo"
send "HTTP/1.1 200 Ok\n" send "HTTP/1.1 200 OK\n"
send "Connection: close\n" send "Connection: close\n"
send "\n" send "\n"
send { <a> <esi/> } send { <a> <esi/> }
......
...@@ -28,7 +28,7 @@ varnish v1 -vcl+backend { ...@@ -28,7 +28,7 @@ varnish v1 -vcl+backend {
# \r\n 2 bytes # \r\n 2 bytes
# Total: 38 bytes # Total: 38 bytes
# Response: # 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 # Content-Length: 1000\r\n 22 bytes
# Connection: keep-alive\r\n 24 bytes # Connection: keep-alive\r\n 24 bytes
# Accept-Ranges: bytes\r\n 22 bytes # Accept-Ranges: bytes\r\n 22 bytes
...@@ -40,7 +40,7 @@ varnish v1 -vcl+backend { ...@@ -40,7 +40,7 @@ varnish v1 -vcl+backend {
# \r\n 2 bytes # \r\n 2 bytes
# Total: 19 bytes # Total: 19 bytes
# Response: # 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 # Content-Length: 2000\r\n 22 bytes
# Connection: keep-alive\r\n 24 bytes # Connection: keep-alive\r\n 24 bytes
# Accept-Ranges: bytes\r\n 22 bytes # Accept-Ranges: bytes\r\n 22 bytes
...@@ -52,7 +52,7 @@ varnish v1 -vcl+backend { ...@@ -52,7 +52,7 @@ varnish v1 -vcl+backend {
# \r\n 2 bytes # \r\n 2 bytes
# Total: 19 bytes # Total: 19 bytes
# Response: # 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 # Content-Length: 2000\r\n 22 bytes
# Connection: keep-alive\r\n 24 bytes # Connection: keep-alive\r\n 24 bytes
# Accept-Ranges: bytes\r\n 22 bytes # Accept-Ranges: bytes\r\n 22 bytes
......
...@@ -32,7 +32,7 @@ varnish v1 -vcl+backend { ...@@ -32,7 +32,7 @@ varnish v1 -vcl+backend {
# Total: 18 bytes # Total: 18 bytes
# Reponse: # 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 # Transfer-Encoding: chunked\r\n 28 bytes
# Connection: keep-alive\r\n 24 bytes # Connection: keep-alive\r\n 24 bytes
# \r\n 2 bytes # \r\n 2 bytes
......
...@@ -37,7 +37,7 @@ varnish v1 -vcl+backend { ...@@ -37,7 +37,7 @@ varnish v1 -vcl+backend {
# asdf 4 bytes # asdf 4 bytes
# resp: # 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 # Content-Length: 4\r\n 19 bytes
# \r\n 2 bytes # \r\n 2 bytes
# fdsa 4 bytes # fdsa 4 bytes
......
...@@ -28,7 +28,7 @@ varnish v1 -vcl+backend { ...@@ -28,7 +28,7 @@ varnish v1 -vcl+backend {
# \r\n 2 bytes # \r\n 2 bytes
# Total: 54 bytes # Total: 54 bytes
# Response: # 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 # Content-Length: 1000\r\n 22 bytes
# \r\n 2 bytes # \r\n 2 bytes
# Total: 41 bytes # Total: 41 bytes
......
...@@ -3,7 +3,7 @@ varnishtest "test reload of object spanning incomplete segment" ...@@ -3,7 +3,7 @@ varnishtest "test reload of object spanning incomplete segment"
server s1 { server s1 {
rxreq rxreq
expect req.url == "/1" expect req.url == "/1"
send "HTTP/1.1 200 Ok\n" send "HTTP/1.1 200 OK\n"
send "Transfer-encoding: chunked\n" send "Transfer-encoding: chunked\n"
send "\n" send "\n"
chunkedlen 32 chunkedlen 32
......
...@@ -3,7 +3,7 @@ varnishtest "Regression test for #387: too long chunk header" ...@@ -3,7 +3,7 @@ varnishtest "Regression test for #387: too long chunk header"
server s1 { server s1 {
rxreq rxreq
non-fatal 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 "Transfer-encoding: chunked\r\n"
send "\r\n" send "\r\n"
send "004\r\n1234\r\n" send "004\r\n1234\r\n"
......
...@@ -2,7 +2,7 @@ varnishtest "Wrong calculation of last storage segment length" ...@@ -2,7 +2,7 @@ varnishtest "Wrong calculation of last storage segment length"
server s1 { server s1 {
rxreq rxreq
send "HTTP/1.1 200 Ok\r\n" send "HTTP/1.1 200 OK\r\n"
send "Transfer-encoding: chunked\r\n" send "Transfer-encoding: chunked\r\n"
send "\r\n" send "\r\n"
# This is chunksize (128k) + 2 to force to chunks to be allocated # This is chunksize (128k) + 2 to force to chunks to be allocated
......
...@@ -2,7 +2,7 @@ varnishtest "HTTP/1.1 Backend sends no length hint" ...@@ -2,7 +2,7 @@ varnishtest "HTTP/1.1 Backend sends no length hint"
server s1 { server s1 {
rxreq rxreq
send "HTTP/1.1 200 Ok\n" send "HTTP/1.1 200 OK\n"
send "\n" send "\n"
send "12345" send "12345"
} -start } -start
......
...@@ -2,7 +2,7 @@ varnishtest "Make sure banlurker skips busy objects" ...@@ -2,7 +2,7 @@ varnishtest "Make sure banlurker skips busy objects"
server s1 { server s1 {
rxreq rxreq
send "HTTP/1.0 200 Ok\r\n" send "HTTP/1.0 200 OK\r\n"
sema r1 sync 2 sema r1 sync 2
send "Foobar: blaf\r\n" send "Foobar: blaf\r\n"
send "Content-Length: 10\r\n" send "Content-Length: 10\r\n"
......
...@@ -760,7 +760,7 @@ cmd_http_txresp(CMD_ARGS) ...@@ -760,7 +760,7 @@ cmd_http_txresp(CMD_ARGS)
struct http *hp; struct http *hp;
const char *proto = "HTTP/1.1"; const char *proto = "HTTP/1.1";
const char *status = "200"; const char *status = "200";
const char *msg = "Ok"; const char *msg = "OK";
char* body = NULL; char* body = NULL;
(void)cmd; (void)cmd;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment