From c50a601f1a77b393503207b7fea4352a28b8a05e Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sat, 19 Jul 2003 23:57:08 +0000 Subject: [PATCH] modified to work fine with the new persistant connection working test suite HTTP server --- tests/data/test10 | 2 +- tests/data/test11 | 8 ++++---- tests/data/test13 | 2 +- tests/data/test15 | 2 ++ tests/data/test16 | 1 + tests/data/test17 | 1 + tests/data/test18 | 6 ++++++ tests/data/test2 | 2 +- tests/data/test22 | 1 + tests/data/test26 | 2 +- tests/data/test27 | 2 +- tests/data/test28 | 8 ++++---- tests/data/test29 | 2 +- tests/data/test301 | 6 +++--- tests/data/test304 | 2 +- tests/data/test306 | 2 +- tests/data/test31 | 1 + tests/data/test33 | 1 + tests/data/test39 | 2 +- tests/data/test4 | 2 +- tests/data/test40 | 8 ++++---- tests/data/test42 | 8 ++++---- tests/data/test43 | 14 +++++++------- tests/data/test44 | 2 +- tests/data/test45 | 14 +++++++------- tests/data/test46 | 2 +- tests/data/test47 | 2 +- tests/data/test49 | 8 ++++---- tests/data/test5 | 2 +- tests/data/test50 | 8 ++++---- tests/data/test502 | 4 ++-- tests/data/test503 | 4 ++-- tests/data/test51 | 8 ++++---- tests/data/test52 | 8 ++++---- tests/data/test53 | 1 + tests/data/test54 | 2 +- tests/data/test55 | 8 ++++---- tests/data/test56 | 2 +- tests/data/test57 | 2 +- tests/data/test58 | 2 +- tests/data/test59 | 2 +- tests/data/test6 | 1 + tests/data/test60 | 2 +- tests/data/test61 | 1 + tests/data/test62 | 2 +- tests/data/test63 | 2 +- tests/data/test64 | 8 ++++---- tests/data/test65 | 4 ++++ tests/data/test66 | 2 +- tests/data/test67 | 6 ++++-- tests/data/test68 | 4 ++++ tests/data/test69 | 10 ++++++---- tests/data/test7 | 4 ++-- tests/data/test70 | 4 ++++ tests/data/test8 | 2 +- tests/data/test9 | 2 +- 56 files changed, 126 insertions(+), 94 deletions(-) diff --git a/tests/data/test10 b/tests/data/test10 index 3b8674943..885c28259 100644 --- a/tests/data/test10 +++ b/tests/data/test10 @@ -1,7 +1,7 @@ # Server-side -HTTP/1.0 200 OK +HTTP/1.0 200 OK swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test11 b/tests/data/test11 index d06cb64f6..fe39c65ac 100644 --- a/tests/data/test11 +++ b/tests/data/test11 @@ -1,7 +1,7 @@ # Server-side -HTTP/1.1 301 This is a weirdo text message +HTTP/1.1 301 This is a weirdo text message swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake Location: data/110002.txt?coolsite=yes @@ -11,7 +11,7 @@ This server reply is for testing a simple Location: following -HTTP/1.1 200 Followed here fine +HTTP/1.1 200 Followed here fine swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -19,13 +19,13 @@ If this is received, the location following worked -HTTP/1.1 301 This is a weirdo text message +HTTP/1.1 301 This is a weirdo text message swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake Location: data/110002.txt?coolsite=yes Connection: close -HTTP/1.1 200 Followed here fine +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/test13 b/tests/data/test13 index 251a12d18..a87c0aee2 100644 --- a/tests/data/test13 +++ b/tests/data/test13 @@ -2,10 +2,10 @@ HTTP/1.1 200 Read you +Content-Length: 29 Deleted: suppose we got a header like this! ;-) blabla custom request result - diff --git a/tests/data/test15 b/tests/data/test15 index 224c0d5aa..d49fffd44 100644 --- a/tests/data/test15 +++ b/tests/data/test15 @@ -5,6 +5,7 @@ HTTP/1.4 200 OK Fake: yes Fake: yes Fake: yes +Content-Length: 26 Repeated nonsense-headers @@ -30,6 +31,7 @@ HTTP/1.4 200 OK Fake: yes Fake: yes Fake: yes +Content-Length: 26 Repeated nonsense-headers http://127.0.0.1:8999/want/15 200 26 diff --git a/tests/data/test16 b/tests/data/test16 index c31cf1acd..28177568b 100644 --- a/tests/data/test16 +++ b/tests/data/test16 @@ -6,6 +6,7 @@ Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake Content-Type: text/html Funny-head: yesyes +Content-Length: 22 the content goes here diff --git a/tests/data/test17 b/tests/data/test17 index a3f30b2bd..94196d05c 100644 --- a/tests/data/test17 +++ b/tests/data/test17 @@ -3,6 +3,7 @@ HTTP/1.1 200 OK Funny-head: yesyes +Content-Length: 27 This is the proof it works diff --git a/tests/data/test18 b/tests/data/test18 index 053909c94..0555fe960 100644 --- a/tests/data/test18 +++ b/tests/data/test18 @@ -3,18 +3,21 @@ HTTP/1.1 200 OK Funny-head: yesyes +Content-Length: 4 moo HTTP/1.1 200 OK Funny-head: yesyes +Content-Length: 4 foo HTTP/1.1 200 OK Funny-head: yesyes +Content-Length: 4 hoo @@ -62,16 +65,19 @@ Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */* --_curl_--127.0.0.1:8999/18 HTTP/1.1 200 OK Funny-head: yesyes +Content-Length: 4 moo --_curl_--127.0.0.1:8999/180002 HTTP/1.1 200 OK Funny-head: yesyes +Content-Length: 4 foo --_curl_--127.0.0.1:8999/180003 HTTP/1.1 200 OK Funny-head: yesyes +Content-Length: 4 hoo diff --git a/tests/data/test2 b/tests/data/test2 index e1357130c..b63fc72c8 100644 --- a/tests/data/test2 +++ b/tests/data/test2 @@ -4,7 +4,7 @@ HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT -Server: test-server/fake +Server: test-server/fake swsclose Content-Type: text/html Funny-head: yesyes diff --git a/tests/data/test22 b/tests/data/test22 index 686a6bb9d..b59c7ffd4 100644 --- a/tests/data/test22 +++ b/tests/data/test22 @@ -3,6 +3,7 @@ HTTP/1.1 200 OK Funny-head: yesyes +Content-Length: 27 This is the proof it works diff --git a/tests/data/test26 b/tests/data/test26 index df42f20eb..79ba8158f 100644 --- a/tests/data/test26 +++ b/tests/data/test26 @@ -1,7 +1,7 @@ # Server-side -HTTP/1.1 200 Mooo +HTTP/1.1 200 Mooo swsclose Server: test-server/fake Connection: close diff --git a/tests/data/test27 b/tests/data/test27 index c0aa6a5ec..c801ff5b5 100644 --- a/tests/data/test27 +++ b/tests/data/test27 @@ -1,7 +1,7 @@ # Server-side -HTTP/1.1 200 Mooo +HTTP/1.1 200 Mooo swsclose Connection: close Set-Cookie: path=/; thewinneris=nowayyouwin; diff --git a/tests/data/test28 b/tests/data/test28 index d59949fa6..67a5490e1 100644 --- a/tests/data/test28 +++ b/tests/data/test28 @@ -1,7 +1,7 @@ # Server-side -HTTP/1.1 301 This is a weirdo text message +HTTP/1.1 301 This is a weirdo text message swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake Location: /online/1,1795,Welcome,00.html/280002.txt?logout=TRUE @@ -11,7 +11,7 @@ This server reply is for testing a simple Location: following -HTTP/1.1 200 Followed here fine +HTTP/1.1 200 Followed here fine swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -19,13 +19,13 @@ If this is received, the location following worked -HTTP/1.1 301 This is a weirdo text message +HTTP/1.1 301 This is a weirdo text message swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake Location: /online/1,1795,Welcome,00.html/280002.txt?logout=TRUE Connection: close -HTTP/1.1 200 Followed here fine +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/test29 b/tests/data/test29 index 465223f98..07c77b12a 100644 --- a/tests/data/test29 +++ b/tests/data/test29 @@ -1,7 +1,7 @@ # Server-side -HTTP/1.1 200 OK +HTTP/1.1 200 OK swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Connection: close diff --git a/tests/data/test301 b/tests/data/test301 index 9226a476b..2d96074cc 100644 --- a/tests/data/test301 +++ b/tests/data/test301 @@ -2,7 +2,7 @@ # Server-side -HTTP/1.1 200 OK +HTTP/1.1 200 OK swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake Content-Type: text/html @@ -21,7 +21,7 @@ https HTTPS GET with user and password --k -u fake:user https://%HOSTIP:%HTTPSPORT/2 +-k -u fake:user https://%HOSTIP:%HTTPSPORT/301 @@ -32,7 +32,7 @@ HTTPS GET with user and password ^User-Agent:.* -GET /2 HTTP/1.1 +GET /301 HTTP/1.1 Authorization: Basic ZmFrZTp1c2Vy Host: 127.0.0.1:8433 Pragma: no-cache diff --git a/tests/data/test304 b/tests/data/test304 index c715cd69e..4cf68a26a 100644 --- a/tests/data/test304 +++ b/tests/data/test304 @@ -4,9 +4,9 @@ HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake +Content-Length: 10 blablabla - diff --git a/tests/data/test306 b/tests/data/test306 index 1704d7c93..31d6fbfcd 100644 --- a/tests/data/test306 +++ b/tests/data/test306 @@ -2,7 +2,7 @@ # Server-side -No headers at all, just data +No headers at all, just data swsclose Let's get diff --git a/tests/data/test31 b/tests/data/test31 index f4bb62215..03f379fcb 100644 --- a/tests/data/test31 +++ b/tests/data/test31 @@ -4,6 +4,7 @@ HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake +Content-Length: 4 Content-Type: text/html Funny-head: yesyes Set-Cookie: foobar=name; domain=anything.com; path=/ ; secure diff --git a/tests/data/test33 b/tests/data/test33 index 3b94f044e..accabd7fc 100644 --- a/tests/data/test33 +++ b/tests/data/test33 @@ -1,6 +1,7 @@ # Server-side +HTTP/1.1 OK swsclose diff --git a/tests/data/test39 b/tests/data/test39 index 6ef41078e..3eeb3974f 100644 --- a/tests/data/test39 +++ b/tests/data/test39 @@ -4,9 +4,9 @@ HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake +Content-Length: 10 blablabla - diff --git a/tests/data/test4 b/tests/data/test4 index cf2a64a5c..2c84c7940 100644 --- a/tests/data/test4 +++ b/tests/data/test4 @@ -4,7 +4,7 @@ HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT -Server: test-server/fake +Server: test-server/fake swsclose Content-Type: text/html Funny-head: yesyes diff --git a/tests/data/test40 b/tests/data/test40 index bbf111d6a..7686bdc87 100644 --- a/tests/data/test40 +++ b/tests/data/test40 @@ -2,14 +2,14 @@ # Server-side -HTTP/1.1 302 OK +HTTP/1.1 302 OK swsclose Location: ../moo.html/?name=d a niel&testcase=/400002 Date: Thu, 09 Nov 2010 14:49:00 GMT Connection: close -HTTP/1.1 200 OK +HTTP/1.1 200 OK swsclose Location: this should be ignored Date: Thu, 09 Nov 2010 14:49:00 GMT Connection: close @@ -17,12 +17,12 @@ Connection: close body -HTTP/1.1 302 OK +HTTP/1.1 302 OK swsclose Location: ../moo.html/?name=d a niel&testcase=/400002 Date: Thu, 09 Nov 2010 14:49:00 GMT Connection: close -HTTP/1.1 200 OK +HTTP/1.1 200 OK swsclose Location: this should be ignored Date: Thu, 09 Nov 2010 14:49:00 GMT Connection: close diff --git a/tests/data/test42 b/tests/data/test42 index eec7f451a..8843b2a54 100644 --- a/tests/data/test42 +++ b/tests/data/test42 @@ -2,14 +2,14 @@ # Server-side -HTTP/1.1 302 OK +HTTP/1.1 302 OK swsclose Location: ../m o o.html/420002 Date: Thu, 09 Nov 2010 14:49:00 GMT Connection: close -HTTP/1.1 200 OK +HTTP/1.1 200 OK swsclose Location: this should be ignored Date: Thu, 09 Nov 2010 14:49:00 GMT Connection: close @@ -17,12 +17,12 @@ Connection: close body -HTTP/1.1 302 OK +HTTP/1.1 302 OK swsclose Location: ../m o o.html/420002 Date: Thu, 09 Nov 2010 14:49:00 GMT Connection: close -HTTP/1.1 200 OK +HTTP/1.1 200 OK swsclose Location: this should be ignored Date: Thu, 09 Nov 2010 14:49:00 GMT Connection: close diff --git a/tests/data/test43 b/tests/data/test43 index adef3bdd1..ba40db061 100644 --- a/tests/data/test43 +++ b/tests/data/test43 @@ -4,14 +4,14 @@ HTTP/1.1 301 This is a weirdo text message Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake -Location: data/110002.txt?coolsite=yes +Location: data/430002.txt?coolsite=yes Connection: close This server reply is for testing a simple Location: following -HTTP/1.1 200 Followed here fine +HTTP/1.1 200 Followed here fine swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -22,10 +22,10 @@ If this is received, the location following worked HTTP/1.1 301 This is a weirdo text message Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake -Location: data/110002.txt?coolsite=yes +Location: data/430002.txt?coolsite=yes Connection: close -HTTP/1.1 200 Followed here fine +HTTP/1.1 200 Followed here fine swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -43,7 +43,7 @@ http HTTP Location: following over HTTP proxy -http://%HOSTIP:%HOSTPORT/want/11 -L -x %HOSTIP:%HOSTPORT +http://%HOSTIP:%HOSTPORT/want/43 -L -x %HOSTIP:%HOSTPORT @@ -53,12 +53,12 @@ http://%HOSTIP:%HOSTPORT/want/11 -L -x %HOSTIP:%HOSTPORT ^User-Agent:.* -GET http://127.0.0.1:8999/want/11 HTTP/1.1 +GET http://127.0.0.1:8999/want/43 HTTP/1.1 Host: 127.0.0.1:8999 Pragma: no-cache Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */* -GET http://127.0.0.1:8999/want/data/110002.txt?coolsite=yes HTTP/1.1 +GET http://127.0.0.1:8999/want/data/430002.txt?coolsite=yes HTTP/1.1 Host: 127.0.0.1:8999 Pragma: no-cache Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */* diff --git a/tests/data/test44 b/tests/data/test44 index 0460df5f3..3af86ebe5 100644 --- a/tests/data/test44 +++ b/tests/data/test44 @@ -1,7 +1,7 @@ # Server-side -HTTP/1.1 200 OK +HTTP/1.1 200 OK swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test45 b/tests/data/test45 index 9897007ea..dbc443b91 100644 --- a/tests/data/test45 +++ b/tests/data/test45 @@ -1,17 +1,17 @@ # Server-side -HTTP/1.1 301 This is a weirdo text message +HTTP/1.1 301 This is a weirdo text message swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake -Location: data.cgi?moo=http://&/110002 +Location: data.cgi?moo=http://&/450002 Connection: close This server reply is for testing a simple Location: following -HTTP/1.1 200 Followed here fine +HTTP/1.1 200 Followed here fine swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -19,13 +19,13 @@ If this is received, the location following worked -HTTP/1.1 301 This is a weirdo text message +HTTP/1.1 301 This is a weirdo text message swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake -Location: data.cgi?moo=http://&/110002 +Location: data.cgi?moo=http://&/450002 Connection: close -HTTP/1.1 200 Followed here fine +HTTP/1.1 200 Followed here fine swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -58,7 +58,7 @@ Host: 127.0.0.1:8999 Pragma: no-cache Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */* -GET /want/data.cgi?moo=http://&/110002 HTTP/1.1 +GET /want/data.cgi?moo=http://&/450002 HTTP/1.1 Host: 127.0.0.1:8999 Pragma: no-cache Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */* diff --git a/tests/data/test46 b/tests/data/test46 index b4ff3e6b6..5ed2fc6a0 100644 --- a/tests/data/test46 +++ b/tests/data/test46 @@ -9,9 +9,9 @@ Set-Cookie: ckyPersistent=permanent; expires=Tue, 01-Jan-2010 05:00:00 GMT; path Set-Cookie: ckySession=temporary; path=/ Set-Cookie: ASPSESSIONIDQGGQQSJJ=GKNBDIFAAOFDPDAIEAKDIBKE; path=/ Cache-control: private +Content-Length: 62 This server reply is for testing a simple Location: following - diff --git a/tests/data/test47 b/tests/data/test47 index 2a3359372..968967d8b 100644 --- a/tests/data/test47 +++ b/tests/data/test47 @@ -2,7 +2,7 @@ # Server-side -HTTP/1.0 200 OK +HTTP/1.0 200 OK swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test49 b/tests/data/test49 index b9c3419fb..4c998772c 100644 --- a/tests/data/test49 +++ b/tests/data/test49 @@ -2,14 +2,14 @@ # Server-side -HTTP/1.1 302 OK +HTTP/1.1 302 OK swsclose Location: ../moo.html/490002 Date: Thu, 09 Nov 2010 14:49:00 GMT Connection: close -HTTP/1.1 200 OK +HTTP/1.1 200 OK swsclose Location: this should be ignored Date: Thu, 09 Nov 2010 14:49:00 GMT Connection: close @@ -17,12 +17,12 @@ Connection: close body -HTTP/1.1 302 OK +HTTP/1.1 302 OK swsclose Location: ../moo.html/490002 Date: Thu, 09 Nov 2010 14:49:00 GMT Connection: close -HTTP/1.1 200 OK +HTTP/1.1 200 OK swsclose Location: this should be ignored Date: Thu, 09 Nov 2010 14:49:00 GMT Connection: close diff --git a/tests/data/test5 b/tests/data/test5 index c04c66a82..0ca47bb5b 100644 --- a/tests/data/test5 +++ b/tests/data/test5 @@ -4,7 +4,7 @@ HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT -Server: test-server/fake +Server: test-server/fake swsclose Content-Type: text/html Funny-head: yesyes diff --git a/tests/data/test50 b/tests/data/test50 index 38b274b92..eb9fd1286 100644 --- a/tests/data/test50 +++ b/tests/data/test50 @@ -2,14 +2,14 @@ # Server-side -HTTP/1.1 302 OK +HTTP/1.1 302 OK swsclose Location: ../../moo.html/500002 Date: Thu, 09 Nov 2010 14:50:00 GMT Connection: close -HTTP/1.1 200 OK +HTTP/1.1 200 OK swsclose Location: this should be ignored Date: Thu, 09 Nov 2010 14:50:00 GMT Connection: close @@ -17,12 +17,12 @@ Connection: close body -HTTP/1.1 302 OK +HTTP/1.1 302 OK swsclose Location: ../../moo.html/500002 Date: Thu, 09 Nov 2010 14:50:00 GMT Connection: close -HTTP/1.1 200 OK +HTTP/1.1 200 OK swsclose Location: this should be ignored Date: Thu, 09 Nov 2010 14:50:00 GMT Connection: close diff --git a/tests/data/test502 b/tests/data/test502 index 4c62bca4e..bd8607fb9 100644 --- a/tests/data/test502 +++ b/tests/data/test502 @@ -3,7 +3,7 @@ foo - bar + bar swsclose bar foo moo @@ -28,7 +28,7 @@ file://%PWD/log/test502.txt foo - bar + bar swsclose bar foo moo diff --git a/tests/data/test503 b/tests/data/test503 index 5792a3803..c81fbeda8 100644 --- a/tests/data/test503 +++ b/tests/data/test503 @@ -1,7 +1,7 @@ # Server-side -HTTP/1.1 200 OK +HTTP/1.1 200 OK swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT @@ -26,7 +26,7 @@ simple multi https:// through proxy with authentication info http://%HOSTIP:%HTTPSPORT/503 localhost:%HOSTPORT - + foo bar bar diff --git a/tests/data/test51 b/tests/data/test51 index 717a5e016..609414f78 100644 --- a/tests/data/test51 +++ b/tests/data/test51 @@ -2,14 +2,14 @@ # Server-side -HTTP/1.1 302 OK +HTTP/1.1 302 OK swsclose Location: ../../../../../../../510002 Date: Thu, 09 Nov 2010 14:50:00 GMT Connection: close -HTTP/1.1 200 OK +HTTP/1.1 200 OK swsclose Location: this should be ignored Date: Thu, 09 Nov 2010 14:50:00 GMT Connection: close @@ -17,12 +17,12 @@ Connection: close body -HTTP/1.1 302 OK +HTTP/1.1 302 OK swsclose Location: ../../../../../../../510002 Date: Thu, 09 Nov 2010 14:50:00 GMT Connection: close -HTTP/1.1 200 OK +HTTP/1.1 200 OK swsclose Location: this should be ignored Date: Thu, 09 Nov 2010 14:50:00 GMT Connection: close diff --git a/tests/data/test52 b/tests/data/test52 index c9ec09e7f..80084f86c 100644 --- a/tests/data/test52 +++ b/tests/data/test52 @@ -2,14 +2,14 @@ # Server-side -HTTP/1.1 302 OK +HTTP/1.1 302 OK swsclose Location: ./520002 Date: Thu, 09 Nov 2010 14:49:00 GMT Connection: close -HTTP/1.1 200 OK +HTTP/1.1 200 OK swsclose Location: this should be ignored Date: Thu, 09 Nov 2010 14:49:00 GMT Connection: close @@ -17,12 +17,12 @@ Connection: close body -HTTP/1.1 302 OK +HTTP/1.1 302 OK swsclose Location: ./520002 Date: Thu, 09 Nov 2010 14:49:00 GMT Connection: close -HTTP/1.1 200 OK +HTTP/1.1 200 OK swsclose Location: this should be ignored Date: Thu, 09 Nov 2010 14:49:00 GMT Connection: close diff --git a/tests/data/test53 b/tests/data/test53 index 9ccac219b..09395f92e 100644 --- a/tests/data/test53 +++ b/tests/data/test53 @@ -6,6 +6,7 @@ Server: Microsoft-IIS/4.0 Date: Tue, 25 Sep 2001 19:37:44 GMT Content-Type: text/html Connection: close +Content-Length: 21 This server says moo diff --git a/tests/data/test54 b/tests/data/test54 index 5582ee1e9..3812ead31 100644 --- a/tests/data/test54 +++ b/tests/data/test54 @@ -1,7 +1,7 @@ # Server-side -HTTP/1.1 302 This is a weirdo text message +HTTP/1.1 302 This is a weirdo text message swsclose Connection: close Location: diff --git a/tests/data/test55 b/tests/data/test55 index 11e25ae0a..9154b4be8 100644 --- a/tests/data/test55 +++ b/tests/data/test55 @@ -1,25 +1,25 @@ -HTTP/1.1 302 OK +HTTP/1.1 302 OK swsclose Location: 550002 Date: Thu, 09 Nov 2010 14:50:00 GMT Connection: close -HTTP/1.1 200 OK +HTTP/1.1 200 OK swsclose Date: Thu, 09 Nov 2010 14:50:00 GMT Connection: close body -HTTP/1.1 302 OK +HTTP/1.1 302 OK swsclose Location: 550002 Date: Thu, 09 Nov 2010 14:50:00 GMT Connection: close -HTTP/1.1 200 OK +HTTP/1.1 200 OK swsclose Date: Thu, 09 Nov 2010 14:50:00 GMT Connection: close diff --git a/tests/data/test56 b/tests/data/test56 index 889182a26..78e29f62e 100644 --- a/tests/data/test56 +++ b/tests/data/test56 @@ -1,7 +1,7 @@ # Server-side -HTTP/1.1 200 OK +HTTP/1.1 200 OK swsclose Funny-head: yesyes This is the proof it works diff --git a/tests/data/test57 b/tests/data/test57 index e091a39cb..397619526 100644 --- a/tests/data/test57 +++ b/tests/data/test57 @@ -1,7 +1,7 @@ # Server-side -HTTP/1.1 200 OK +HTTP/1.1 200 OK swsclose Funny-head: yesyes Content-Type: text/html; charset=ISO-8859-4 diff --git a/tests/data/test58 b/tests/data/test58 index b7f413d5b..9c8cce898 100644 --- a/tests/data/test58 +++ b/tests/data/test58 @@ -1,7 +1,7 @@ # Server-side -HTTP/1.0 200 OK +HTTP/1.0 200 OK swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test59 b/tests/data/test59 index 198e4828f..4e74bcb4f 100644 --- a/tests/data/test59 +++ b/tests/data/test59 @@ -2,7 +2,7 @@ # Server-side -HTTP/1.1 200 OK +HTTP/1.1 200 OK swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test6 b/tests/data/test6 index 0e1c3c715..c16141cb1 100644 --- a/tests/data/test6 +++ b/tests/data/test6 @@ -6,6 +6,7 @@ Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake Content-Type: text/html Funny-head: yesyes +swsclose: booo diff --git a/tests/data/test60 b/tests/data/test60 index 623dbe1f0..1f9403a2b 100644 --- a/tests/data/test60 +++ b/tests/data/test60 @@ -1,7 +1,7 @@ # Server-side -HTTP/1.0 200 OK +HTTP/1.0 200 OK swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test61 b/tests/data/test61 index bf624018e..00cc74d04 100644 --- a/tests/data/test61 +++ b/tests/data/test61 @@ -11,6 +11,7 @@ Set-Cookie: test2=yes; domain=host.foo.com; expires=Tue Feb 1 11:56:27 MET 2007 Set-Cookie: test3=maybe; domain=foo.com; path=/moo; secure Set-Cookie: test4=no; domain=nope.foo.com; path=/moo; secure Set-Cookie: test5=name; domain=anything.com; path=/ ; secure +Content-Length: 4 boo diff --git a/tests/data/test62 b/tests/data/test62 index f1d6c1a2a..e29c3d7b5 100644 --- a/tests/data/test62 +++ b/tests/data/test62 @@ -1,7 +1,7 @@ # Server-side -HTTP/1.1 200 OK +HTTP/1.1 200 OK swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Content-Type: text/html diff --git a/tests/data/test63 b/tests/data/test63 index 040235ee0..cb44e0de7 100644 --- a/tests/data/test63 +++ b/tests/data/test63 @@ -1,7 +1,7 @@ # Server-side -HTTP/1.1 200 OK +HTTP/1.1 200 OK swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Content-Type: text/html diff --git a/tests/data/test64 b/tests/data/test64 index 3c88fa4f8..5fd42e464 100644 --- a/tests/data/test64 +++ b/tests/data/test64 @@ -1,7 +1,7 @@ # Server-side -HTTP/1.1 401 Authorization Required +HTTP/1.1 401 Authorization Required swsclose Server: Apache/1.3.27 (Darwin) PHP/4.1.2 WWW-Authenticate: Digest realm="testrealm", nonce="1053604145" Content-Type: text/html; charset=iso-8859-1 @@ -12,7 +12,7 @@ This is not the real page # This is supposed to be returned when the server gets a # Authorization: Digest line passed-in from the client -HTTP/1.1 200 OK +HTTP/1.1 200 OK swsclose Server: Apache/1.3.27 (Darwin) PHP/4.1.2 Content-Type: text/html; charset=iso-8859-1 @@ -20,12 +20,12 @@ This IS the real page! -HTTP/1.1 401 Authorization Required +HTTP/1.1 401 Authorization Required swsclose Server: Apache/1.3.27 (Darwin) PHP/4.1.2 WWW-Authenticate: Digest realm="testrealm", nonce="1053604145" Content-Type: text/html; charset=iso-8859-1 -HTTP/1.1 200 OK +HTTP/1.1 200 OK swsclose Server: Apache/1.3.27 (Darwin) PHP/4.1.2 Content-Type: text/html; charset=iso-8859-1 diff --git a/tests/data/test65 b/tests/data/test65 index a1280cb99..e6445c570 100644 --- a/tests/data/test65 +++ b/tests/data/test65 @@ -5,6 +5,7 @@ HTTP/1.1 401 Authorization Required Server: Apache/1.3.27 (Darwin) PHP/4.1.2 WWW-Authenticate: Digest realm="testrealm", nonce="2053604145" Content-Type: text/html; charset=iso-8859-1 +Content-Length: 26 This is not the real page @@ -15,6 +16,7 @@ This is not the real page HTTP/1.1 401 Still a bad password you moron Server: Apache/1.3.27 (Darwin) PHP/4.1.2 Content-Type: text/html; charset=iso-8859-1 +Content-Length: 34 This is not the real page either @@ -24,10 +26,12 @@ HTTP/1.1 401 Authorization Required Server: Apache/1.3.27 (Darwin) PHP/4.1.2 WWW-Authenticate: Digest realm="testrealm", nonce="2053604145" Content-Type: text/html; charset=iso-8859-1 +Content-Length: 26 HTTP/1.1 401 Still a bad password you moron Server: Apache/1.3.27 (Darwin) PHP/4.1.2 Content-Type: text/html; charset=iso-8859-1 +Content-Length: 34 This is not the real page either diff --git a/tests/data/test66 b/tests/data/test66 index 45ac2f144..cfc3214b6 100644 --- a/tests/data/test66 +++ b/tests/data/test66 @@ -1,7 +1,7 @@ # Server-side -no headers +no headers swsclose diff --git a/tests/data/test67 b/tests/data/test67 index ece249ef2..ae92276b3 100644 --- a/tests/data/test67 +++ b/tests/data/test67 @@ -9,6 +9,7 @@ HTTP/1.1 401 Now gimme that second request of crap Server: Microsoft-IIS/5.0 Content-Type: text/html; charset=iso-8859-1 +Content-Length: 34 WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA== This is not the real page either! @@ -17,7 +18,7 @@ This is not the real page either! # This is supposed to be returned when the server gets the second # Authorization: NTLM line passed-in from the client -HTTP/1.1 200 Things are fine in server land +HTTP/1.1 200 Things are fine in server land swsclose Server: Microsoft-IIS/5.0 Content-Type: text/html; charset=iso-8859-1 @@ -28,9 +29,10 @@ Finally, this is the real page! HTTP/1.1 401 Now gimme that second request of crap Server: Microsoft-IIS/5.0 Content-Type: text/html; charset=iso-8859-1 +Content-Length: 34 WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA== -HTTP/1.1 200 Things are fine in server land +HTTP/1.1 200 Things are fine in server land swsclose Server: Microsoft-IIS/5.0 Content-Type: text/html; charset=iso-8859-1 diff --git a/tests/data/test68 b/tests/data/test68 index bd68e3ce8..0eab3d76b 100644 --- a/tests/data/test68 +++ b/tests/data/test68 @@ -6,6 +6,7 @@ HTTP/1.1 401 Now gimme that second request of crap Server: Microsoft-IIS/5.0 +Content-Length: 34 Content-Type: text/html; charset=iso-8859-1 WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA== @@ -18,6 +19,7 @@ This is not the real page either! HTTP/1.1 401 You give me wrong password Server: Microsoft-IIS/5.0 WWW-Authenticate: NTLM +Content-Length: 46 Content-Type: text/html; charset=iso-8859-1 Wrong password dude. Get it fixed and return. @@ -26,12 +28,14 @@ Wrong password dude. Get it fixed and return. HTTP/1.1 401 Now gimme that second request of crap Server: Microsoft-IIS/5.0 +Content-Length: 34 Content-Type: text/html; charset=iso-8859-1 WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA== HTTP/1.1 401 You give me wrong password Server: Microsoft-IIS/5.0 WWW-Authenticate: NTLM +Content-Length: 46 Content-Type: text/html; charset=iso-8859-1 Wrong password dude. Get it fixed and return. diff --git a/tests/data/test69 b/tests/data/test69 index daf7c4d9f..087783fe0 100644 --- a/tests/data/test69 +++ b/tests/data/test69 @@ -1,7 +1,7 @@ # Server-side -HTTP/1.1 401 Authorization Required +HTTP/1.1 401 Authorization Required swsclose Server: Apache/1.3.27 (Darwin) PHP/4.1.2 WWW-Authenticate: Basic WWW-Authenticate: Wild-and-crazy @@ -16,6 +16,7 @@ This is not the real page HTTP/1.1 401 Now gimme that second request of crap Server: Microsoft-IIS/5.0 +Content-Length: 34 Content-Type: text/html; charset=iso-8859-1 WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA== @@ -25,7 +26,7 @@ This is not the real page either! # This is supposed to be returned when the server gets the second # Authorization: NTLM line passed-in from the client -HTTP/1.1 200 Things are fine in server land +HTTP/1.1 200 Things are fine in server land swsclose Server: Microsoft-IIS/5.0 Content-Type: text/html; charset=iso-8859-1 @@ -33,7 +34,7 @@ Finally, this is the real page! -HTTP/1.1 401 Authorization Required +HTTP/1.1 401 Authorization Required swsclose Server: Apache/1.3.27 (Darwin) PHP/4.1.2 WWW-Authenticate: Basic WWW-Authenticate: Wild-and-crazy @@ -42,10 +43,11 @@ Content-Type: text/html; charset=iso-8859-1 HTTP/1.1 401 Now gimme that second request of crap Server: Microsoft-IIS/5.0 +Content-Length: 34 Content-Type: text/html; charset=iso-8859-1 WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA== -HTTP/1.1 200 Things are fine in server land +HTTP/1.1 200 Things are fine in server land swsclose Server: Microsoft-IIS/5.0 Content-Type: text/html; charset=iso-8859-1 diff --git a/tests/data/test7 b/tests/data/test7 index 5299529a5..d7c656a7c 100644 --- a/tests/data/test7 +++ b/tests/data/test7 @@ -5,7 +5,7 @@ HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake Content-Type: text/html -Funny-head: yesyes +Funny-head: yesyes swsclose Set-Cookie: foobar=name; domain=127.0.0.1; path=/; Set-Cookie: mismatch=this; domain=127.0.0.1; path="/silly/"; Set-Cookie: partmatch=present; domain=.0.0.1; path=/; @@ -43,7 +43,7 @@ HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake Content-Type: text/html -Funny-head: yesyes +Funny-head: yesyes swsclose Set-Cookie: foobar=name; domain=127.0.0.1; path=/; Set-Cookie: mismatch=this; domain=127.0.0.1; path="/silly/"; Set-Cookie: partmatch=present; domain=.0.0.1; path=/; diff --git a/tests/data/test70 b/tests/data/test70 index eaa65d00d..b2d5f863b 100644 --- a/tests/data/test70 +++ b/tests/data/test70 @@ -6,6 +6,7 @@ Server: Apache/1.3.27 (Darwin) PHP/4.1.2 WWW-Authenticate: Digest realm="testrealm", nonce="1053604199" WWW-Authenticate: NTLM Content-Type: text/html; charset=iso-8859-1 +Content-Length: 26 This is not the real page @@ -16,6 +17,7 @@ This is not the real page HTTP/1.1 200 OK Server: Apache/1.3.27 (Darwin) PHP/4.1.2 Content-Type: text/html; charset=iso-8859-1 +Content-Length: 23 This IS the real page! @@ -26,10 +28,12 @@ Server: Apache/1.3.27 (Darwin) PHP/4.1.2 WWW-Authenticate: Digest realm="testrealm", nonce="1053604199" WWW-Authenticate: NTLM Content-Type: text/html; charset=iso-8859-1 +Content-Length: 26 HTTP/1.1 200 OK Server: Apache/1.3.27 (Darwin) PHP/4.1.2 Content-Type: text/html; charset=iso-8859-1 +Content-Length: 23 This IS the real page! diff --git a/tests/data/test8 b/tests/data/test8 index 5ee7fc857..da68b748e 100644 --- a/tests/data/test8 +++ b/tests/data/test8 @@ -1,7 +1,7 @@ # Server-side -HTTP/1.1 200 OK +HTTP/1.1 200 OK swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test9 b/tests/data/test9 index 3eb6f4878..b2d5c9299 100644 --- a/tests/data/test9 +++ b/tests/data/test9 @@ -1,7 +1,7 @@ # Server-side -HTTP/1.1 200 OK +HTTP/1.1 200 OK swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake