diff --git a/tests/FILEFORMAT b/tests/FILEFORMAT index a1d82bf46..342d8266b 100644 --- a/tests/FILEFORMAT +++ b/tests/FILEFORMAT @@ -37,9 +37,9 @@ which are treated together as a single identifier. - + data to be sent to the client on its request and later verified that it arrived -safely. Set nocheck="1" to prevent the test script from verifying the arrival +safely. Set nocheck="yes" to prevent the test script from verifying the arrival of this data. If the data contains 'swsclose' anywhere within the start and end tag, and diff --git a/tests/data/test1029 b/tests/data/test1029 index 97e7fc05f..9c2bc5ff0 100644 --- a/tests/data/test1029 +++ b/tests/data/test1029 @@ -11,7 +11,7 @@ followlocation # Server-side - + HTTP/1.1 301 This is a weirdo text message swsclose Location: data/10290002.txt?coolsite=yes Content-Length: 62 diff --git a/tests/data/test1036 b/tests/data/test1036 index 471a11578..b8ebc4fc0 100644 --- a/tests/data/test1036 +++ b/tests/data/test1036 @@ -10,7 +10,7 @@ Resume # Server-side - + expected to be a file without the first part but we emulate that diff --git a/tests/data/test1037 b/tests/data/test1037 index e4a705dfb..d9cdc0a66 100644 --- a/tests/data/test1037 +++ b/tests/data/test1037 @@ -10,7 +10,7 @@ Resume # Server-side - + expected to be a file without the first part but we emulate that diff --git a/tests/data/test1064 b/tests/data/test1064 index 31a6ee7b0..dd05ddf3a 100644 --- a/tests/data/test1064 +++ b/tests/data/test1064 @@ -7,7 +7,7 @@ HTTP PUT - + HTTP/1.1 200 A OK Server: curl test Content-Type: text/html; charset=iso-8859-1 @@ -15,7 +15,7 @@ Content-Length: 3 ok - + HTTP/1.1 200 A OK Server: curl test Content-Type: text/html; charset=iso-8859-1 diff --git a/tests/data/test1065 b/tests/data/test1065 index 87f4654ca..5688ff964 100644 --- a/tests/data/test1065 +++ b/tests/data/test1065 @@ -8,7 +8,7 @@ HTTP GET - + HTTP/1.1 200 A OK Server: curl test Content-Type: text/html; charset=iso-8859-1 @@ -16,7 +16,7 @@ Content-Length: 3 ok - + HTTP/1.1 200 A OK Server: curl test Content-Type: text/html; charset=iso-8859-1 diff --git a/tests/data/test1066 b/tests/data/test1066 index c2cbff691..bacedefbb 100644 --- a/tests/data/test1066 +++ b/tests/data/test1066 @@ -8,7 +8,7 @@ HTTP GET # Server-side - + HTTP/1.1 200 OK Server: thebest/1.0 Content-Type: text/plain @@ -16,7 +16,7 @@ Content-Length: 6 first - + HTTP/1.1 200 OK Server: thebest/1.0 Content-Type: text/plain diff --git a/tests/data/test1074 b/tests/data/test1074 index bb710ce75..3464b4183 100644 --- a/tests/data/test1074 +++ b/tests/data/test1074 @@ -9,7 +9,7 @@ HTTP/1.0 # Server-side - + HTTP/1.0 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Content-Length: 9 diff --git a/tests/data/test1078 b/tests/data/test1078 index 15cd6a02c..2ff4543d9 100644 --- a/tests/data/test1078 +++ b/tests/data/test1078 @@ -13,7 +13,7 @@ proxytunnel # # Server-side - + HTTP/1.0 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test1080 b/tests/data/test1080 index 5879a6f17..ae37fb7fd 100644 --- a/tests/data/test1080 +++ b/tests/data/test1080 @@ -11,7 +11,7 @@ followlocation # Server-side - + HTTP/1.1 301 This is a weirdo text message swsclose Location: data/10800002.txt?coolsite=yes Content-Length: 62 diff --git a/tests/data/test1081 b/tests/data/test1081 index b91ef6035..d290020b6 100644 --- a/tests/data/test1081 +++ b/tests/data/test1081 @@ -11,7 +11,7 @@ followlocation # Server-side - + HTTP/1.1 301 This is a weirdo text message swsclose Location: data/10810099.txt?coolsite=yes Content-Length: 62 @@ -19,7 +19,7 @@ Connection: close This server reply is for testing a simple Location: following - + HTTP/1.1 200 Followed here fine swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test1089 b/tests/data/test1089 index ca8e648ab..d2a18a21d 100644 --- a/tests/data/test1089 +++ b/tests/data/test1089 @@ -11,7 +11,7 @@ followlocation # # Server-side - + HTTP/1.1 302 OK swsbounce swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Content-Length: 8 @@ -21,7 +21,7 @@ Location: ./10890001 monster - + HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Content-Length: 15 diff --git a/tests/data/test1090 b/tests/data/test1090 index 14d984c86..3304f911d 100644 --- a/tests/data/test1090 +++ b/tests/data/test1090 @@ -12,7 +12,7 @@ chunked Transfer-Encoding # # Server-side - + HTTP/1.1 302 OK swsbounce swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Content-Length: 8 @@ -22,7 +22,7 @@ Location: ./10900001 monster - + HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Transfer-Encoding: chunked diff --git a/tests/data/test15 b/tests/data/test15 index 6b101cd2a..3b1fa4369 100644 --- a/tests/data/test15 +++ b/tests/data/test15 @@ -8,7 +8,7 @@ HTTP GET # Server-side - + HTTP/1.4 200 OK Fake: yes Fake: yes diff --git a/tests/data/test152 b/tests/data/test152 index b10503e64..c3f4159e8 100644 --- a/tests/data/test152 +++ b/tests/data/test152 @@ -1,7 +1,7 @@ # Server-side - + HTTP/1.0 401 BAD BOY Server: swsclose Content-Type: text/html diff --git a/tests/data/test160 b/tests/data/test160 index 557fe47c0..d6ead5937 100644 --- a/tests/data/test160 +++ b/tests/data/test160 @@ -1,7 +1,7 @@ # Server-side - + HTTP/1.1 200 OK swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Content-Length: 9 diff --git a/tests/data/test162 b/tests/data/test162 index 4f793d9a2..9b75f7c6b 100644 --- a/tests/data/test162 +++ b/tests/data/test162 @@ -11,7 +11,7 @@ FAILURE # Server-side - + HTTP/1.0 407 BAD BOY Proxy-Authenticate: Basic realm="Squid proxy-caching web server" Server: swsclose diff --git a/tests/data/test18 b/tests/data/test18 index 9da0bb743..ff65817d1 100644 --- a/tests/data/test18 +++ b/tests/data/test18 @@ -8,7 +8,7 @@ HTTP GET # Server-side - + HTTP/1.1 200 OK Funny-head: yesyes Content-Length: 4 diff --git a/tests/data/test192 b/tests/data/test192 index bd03d2b9d..5f59e1850 100644 --- a/tests/data/test192 +++ b/tests/data/test192 @@ -2,7 +2,7 @@ # # Server-side - + HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Content-Length: 8 diff --git a/tests/data/test193 b/tests/data/test193 index 19057751d..c5425bb3f 100644 --- a/tests/data/test193 +++ b/tests/data/test193 @@ -11,7 +11,7 @@ followlocation # # Server-side - + HTTP/1.1 302 OK swsbounce swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Content-Length: 8 @@ -20,7 +20,7 @@ Location: ./193 monster - + HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Content-Length: 8 diff --git a/tests/data/test197 b/tests/data/test197 index 39fae5e7c..062f469f2 100644 --- a/tests/data/test197 +++ b/tests/data/test197 @@ -2,14 +2,14 @@ # # Server-side - + HTTP/1.1 503 OK swsbounce Date: Thu, 09 Nov 2010 14:49:00 GMT Content-Length: 21 server not available - + HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Content-Length: 3 diff --git a/tests/data/test2000 b/tests/data/test2000 index b5f4777d5..d3edb16e5 100644 --- a/tests/data/test2000 +++ b/tests/data/test2000 @@ -11,7 +11,7 @@ multiprotocol # # Server-side - + data to see diff --git a/tests/data/test2001 b/tests/data/test2001 index 475007e86..68c0df784 100644 --- a/tests/data/test2001 +++ b/tests/data/test2001 @@ -13,7 +13,7 @@ multiprotocol # # Server-side - + HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -27,7 +27,7 @@ Funny-head: yesyes -foo- - + data to see diff --git a/tests/data/test2002 b/tests/data/test2002 index ed8ca1c4a..f39cd60f1 100644 --- a/tests/data/test2002 +++ b/tests/data/test2002 @@ -15,7 +15,7 @@ multiprotocol # # Server-side - + HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -29,7 +29,7 @@ Funny-head: yesyes -foo- - + data to see @@ -37,7 +37,7 @@ that FTP works so does it? - + a chunk of data returned diff --git a/tests/data/test2003 b/tests/data/test2003 index b6938166b..57c0d24e6 100644 --- a/tests/data/test2003 +++ b/tests/data/test2003 @@ -15,7 +15,7 @@ multiprotocol # # Server-side - + HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -29,7 +29,7 @@ Funny-head: yesyes -foo- - + data to see @@ -37,7 +37,7 @@ that FTP works so does it? - + a chunk of data returned diff --git a/tests/data/test2004 b/tests/data/test2004 index eedabf381..7433667be 100644 --- a/tests/data/test2004 +++ b/tests/data/test2004 @@ -13,7 +13,7 @@ multiprotocol # # Server-side - + Test data file for tftp test diff --git a/tests/data/test217 b/tests/data/test217 index 63bb691a9..9d86ced23 100644 --- a/tests/data/test217 +++ b/tests/data/test217 @@ -15,7 +15,7 @@ followlocation # this is returned first since we get no proxy-auth - + HTTP/1.1 405 Method Not Allowed swsclose And you should ignore this data. diff --git a/tests/data/test24 b/tests/data/test24 index 3649f2895..7985f43b7 100644 --- a/tests/data/test24 +++ b/tests/data/test24 @@ -7,7 +7,7 @@ HTTP GET # Server-side - + HTTP/1.0 404 BAD BOY Content-Type: text/html diff --git a/tests/data/test256 b/tests/data/test256 index d82f17414..5f8323b67 100644 --- a/tests/data/test256 +++ b/tests/data/test256 @@ -10,7 +10,7 @@ FAILURE # Server-side - + HTTP/1.0 200 Mooo Date: Mon, 13 Nov 2000 13:41:09 GMT Server: myown/1.0 diff --git a/tests/data/test287 b/tests/data/test287 index 147798c72..507387884 100644 --- a/tests/data/test287 +++ b/tests/data/test287 @@ -12,7 +12,7 @@ proxytunnel # this is returned first since we get no proxy-auth - + HTTP/1.1 405 Method Not Allowed swsclose And you should ignore this data. diff --git a/tests/data/test293 b/tests/data/test293 index add686533..d75fc9a3c 100644 --- a/tests/data/test293 +++ b/tests/data/test293 @@ -11,7 +11,7 @@ FAILURE # # Server-side - + HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test38 b/tests/data/test38 index 377b5b2ae..75155866d 100644 --- a/tests/data/test38 +++ b/tests/data/test38 @@ -9,7 +9,7 @@ FAILURE # Server-side - + HTTP/1.0 200 Mooo Date: Mon, 13 Nov 2000 13:41:09 GMT Server: myown/1.0 diff --git a/tests/data/test522 b/tests/data/test522 index c96f55e8e..4ac46ff75 100644 --- a/tests/data/test522 +++ b/tests/data/test522 @@ -10,7 +10,7 @@ CURLOPT_PORT # # Server-side - + HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test523 b/tests/data/test523 index c671ad1be..4c67cdbd8 100644 --- a/tests/data/test523 +++ b/tests/data/test523 @@ -12,7 +12,7 @@ CURLOPT_PROXY # # Server-side - + HTTP/1.1 200 OK swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test546 b/tests/data/test546 index 1dd1cd41e..12e604a0e 100644 --- a/tests/data/test546 +++ b/tests/data/test546 @@ -9,7 +9,7 @@ multi # Server-side - + data to see diff --git a/tests/data/test549 b/tests/data/test549 index e83f08af4..298d0ad98 100644 --- a/tests/data/test549 +++ b/tests/data/test549 @@ -11,7 +11,7 @@ HTTP proxy # # Server-side - + HTTP/1.1 200 OK swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test550 b/tests/data/test550 index c7a11eb90..c99cf4bed 100644 --- a/tests/data/test550 +++ b/tests/data/test550 @@ -11,7 +11,7 @@ CURLOPT_PROXY # # Server-side - + HTTP/1.1 200 OK swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test57 b/tests/data/test57 index 7af555a75..0724eac82 100644 --- a/tests/data/test57 +++ b/tests/data/test57 @@ -9,7 +9,7 @@ HTTP GET # Server-side - + HTTP/1.1 200 OK swsclose Funny-head: yesyes Content-Type: text/html; charset=ISO-8859-4 diff --git a/tests/data/test612 b/tests/data/test612 index 972656a23..c9582b98d 100644 --- a/tests/data/test612 +++ b/tests/data/test612 @@ -9,7 +9,7 @@ post-quote # # Server-side - + Dummy test file for remove test diff --git a/tests/data/test74 b/tests/data/test74 index ba6a42910..4c08e26eb 100644 --- a/tests/data/test74 +++ b/tests/data/test74 @@ -9,7 +9,7 @@ HTTP GET # # Server-side - + HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test86 b/tests/data/test86 index 9ddc043cd..70c28e93b 100644 --- a/tests/data/test86 +++ b/tests/data/test86 @@ -9,7 +9,7 @@ HTTP GET # # Server-side - + HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test94 b/tests/data/test94 index 6660302a1..9b6a5f6eb 100644 --- a/tests/data/test94 +++ b/tests/data/test94 @@ -11,7 +11,7 @@ FAILURE # # Server-side - + HTTP/1.1 407 Needs proxy authentication Server: test-server/fake swsclose yesyes Proxy-Authenticate: Basic "oh please"