modified to work fine with the new persistant connection working test suite

HTTP server

diff --git a/tests/data/test10 b/tests/data/test10
index 3b8674943d166228d33fd1d7675e9b858f487a19..885c28259e4e3ee4b32270c6507e665d168903e7 100644 (file)
--- a/tests/data/test10
+++ b/tests/data/test10
@@ -1,7 +1,7 @@
 # Server-side
 <reply>
 <data>
-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 d06cb64f64663ff496f4373b1c5c43ca2c1c72c7..fe39c65ac773cc14f2558c7d951a5c895fc30df6 100644 (file)
--- a/tests/data/test11
+++ b/tests/data/test11
@@ -1,7 +1,7 @@
 # Server-side
 <reply>
 <data>
-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
 
 </data>
 <data2>
-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
 
 </data2>
 <datacheck>
-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 251a12d181ef0febe352e97eddf9f3400d1a3323..a87c0aee281d26c618619b483567d370cf9c0022 100644 (file)
--- a/tests/data/test13
+++ b/tests/data/test13
@@ -2,10 +2,10 @@
 <reply>
 <data>
 HTTP/1.1 200 Read you
+Content-Length: 29\r
 Deleted: suppose we got a header like this! ;-)
 
 blabla custom request result
-
 </data>
 </reply>
 

diff --git a/tests/data/test15 b/tests/data/test15
index 224c0d5aaecf008a749fa980304c57c8f798e31f..d49fffd445e932eb2617904575f16639b15e6926 100644 (file)
--- a/tests/data/test15
+++ b/tests/data/test15
@@ -5,6 +5,7 @@ HTTP/1.4 200 OK
 Fake: yes\r
 Fake: yes\r
 Fake: yes\r
+Content-Length: 26\r
 \r
 Repeated nonsense-headers
 </data>
@@ -30,6 +31,7 @@ HTTP/1.4 200 OK
 Fake: yes\r
 Fake: yes\r
 Fake: yes\r
+Content-Length: 26\r
 \r
 Repeated nonsense-headers
 http://127.0.0.1:8999/want/15 200 26

diff --git a/tests/data/test16 b/tests/data/test16
index c31cf1acd15044507272fcbf94d696044a595279..28177568bd4e0a90ba02a9cf2b8fb90241b3c989 100644 (file)
--- 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\r
 Content-Type: text/html\r
 Funny-head: yesyes\r
+Content-Length: 22\r
 \r
 the content goes here
 </data>

diff --git a/tests/data/test17 b/tests/data/test17
index a3f30b2bd3380c66ab7617110b13190e13fed91e..94196d05c33bd39ed8db37f25c9b27c51cd04856 100644 (file)
--- a/tests/data/test17
+++ b/tests/data/test17
@@ -3,6 +3,7 @@
 <data>
 HTTP/1.1 200 OK
 Funny-head: yesyes
+Content-Length: 27\r
 
 This is the proof it works
 </data>

diff --git a/tests/data/test18 b/tests/data/test18
index 053909c947128bbfe3c1f7c593b2f7152c2554c7..0555fe9604115d1f76697b6d0a5007168585ba97 100644 (file)
--- a/tests/data/test18
+++ b/tests/data/test18
@@ -3,18 +3,21 @@
 <data nocheck=1>
 HTTP/1.1 200 OK
 Funny-head: yesyes
+Content-Length: 4\r
 
 moo
 </data>
 <data2>
 HTTP/1.1 200 OK
 Funny-head: yesyes
+Content-Length: 4\r
 
 foo
 </data2>
 <data3>
 HTTP/1.1 200 OK
 Funny-head: yesyes
+Content-Length: 4\r
 
 hoo
 </data3>
@@ -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\r
 
 moo
 --_curl_--127.0.0.1:8999/180002
 HTTP/1.1 200 OK
 Funny-head: yesyes
+Content-Length: 4\r
 
 foo
 --_curl_--127.0.0.1:8999/180003
 HTTP/1.1 200 OK
 Funny-head: yesyes
+Content-Length: 4\r
 
 hoo
 </stdout>

diff --git a/tests/data/test2 b/tests/data/test2
index e1357130c41a3337e6958be83f911c070eafd64f..b63fc72c8bf386422981fb0440f57bd1d1eb4a1f 100644 (file)
--- a/tests/data/test2
+++ b/tests/data/test2
@@ -4,7 +4,7 @@
 <data>
 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 686a6bb9daf8a064058b4228003682c166a1084c..b59c7ffd4592aa7a8d3592ac0fc6f661345a34cb 100644 (file)
--- a/tests/data/test22
+++ b/tests/data/test22
@@ -3,6 +3,7 @@
 <data>
 HTTP/1.1 200 OK
 Funny-head: yesyes
+Content-Length: 27\r
 
 This is the proof it works
 </data>

diff --git a/tests/data/test26 b/tests/data/test26
index df42f20eb588ef330ffd741925d7db7ae8b27dd6..79ba8158f3b20e7ff3078e3dd9cc86d211621130 100644 (file)
--- a/tests/data/test26
+++ b/tests/data/test26
@@ -1,7 +1,7 @@
 # Server-side
 <reply>
 <data>
-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 c0aa6a5ec8d530b9423cc588cd27e462773d3650..c801ff5b5f8eb9907bc3cd1d1df4b7ee774e4c1a 100644 (file)
--- a/tests/data/test27
+++ b/tests/data/test27
@@ -1,7 +1,7 @@
 # Server-side
 <reply>
 <data>
-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 d59949fa6fe019e5e090fb7edd6496cfe0b6526f..67a5490e1eaab1da4576807a6ff9656373fc8dca 100644 (file)
--- a/tests/data/test28
+++ b/tests/data/test28
@@ -1,7 +1,7 @@
 # Server-side
 <reply>
 <data>
-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
 
 </data>
 <data2>
-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
 
 </data2>
 <datacheck>
-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 465223f984a10cfbfbe4deb678a9b836e13329c6..07c77b12acb9f0e16a5498a89cc2e17b7aaf45f0 100644 (file)
--- a/tests/data/test29
+++ b/tests/data/test29
@@ -1,7 +1,7 @@
 # Server-side
 <reply>
 <data>
-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 9226a476b5d8c717c89e6c1a0ede86106b931b56..2d96074cc108bf353b8190855a8cd48e56ef6899 100644 (file)
--- a/tests/data/test301
+++ b/tests/data/test301
@@ -2,7 +2,7 @@
 # Server-side
 <reply>
 <data>
-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
  </name>
  <command>
--k -u fake:user https://%HOSTIP:%HTTPSPORT/2
+-k -u fake:user https://%HOSTIP:%HTTPSPORT/301
 </command>
 </test>
 
@@ -32,7 +32,7 @@ HTTPS GET with user and password
 ^User-Agent:.*
 </strip>
 <protocol>
-GET /2 HTTP/1.1\r
+GET /301 HTTP/1.1\r
 Authorization: Basic ZmFrZTp1c2Vy\r
 Host: 127.0.0.1:8433\r
 Pragma: no-cache\r

diff --git a/tests/data/test304 b/tests/data/test304
index c715cd69e6ae12ae6b00f51eba4c6d223118fec9..4cf68a26a83ffe12948418a9de889e98ef67a8ab 100644 (file)
--- 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\r
 
 blablabla
-
 </data>
 </reply>
 

diff --git a/tests/data/test306 b/tests/data/test306
index 1704d7c93bde3c714fb7c72bf39647f4f7d32916..31d6fbfcdd4151e8d7eb31ee9bb98527c19c98cc 100644 (file)
--- a/tests/data/test306
+++ b/tests/data/test306
@@ -2,7 +2,7 @@
 # Server-side
 <reply>
 <data>
-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 f4bb622151217a50a43ca109c9e1073bab1c5148..03f379fcbfb3fbf7247786cbe4c52fac1996900a 100644 (file)
--- a/tests/data/test31
+++ b/tests/data/test31
@@ -4,6 +4,7 @@
 HTTP/1.1 200 OK\r
 Date: Thu, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
+Content-Length: 4\r
 Content-Type: text/html\r
 Funny-head: yesyes\r
 Set-Cookie: foobar=name; domain=anything.com; path=/ ; secure\r

diff --git a/tests/data/test33 b/tests/data/test33
index 3b94f044e78385c377f5efc954c91b26b9c20da9..accabd7fc08e930b3e557aea9d25f4d9eb057311 100644 (file)
--- a/tests/data/test33
+++ b/tests/data/test33
@@ -1,6 +1,7 @@
 # Server-side
 <reply>
 <data>
+HTTP/1.1 OK swsclose
 
 </data>
 </reply>

diff --git a/tests/data/test39 b/tests/data/test39
index 6ef41078e2f0cdc540954eb260f84ea62ce441b0..3eeb3974f117f0bcba4e679688810a3e03b49dae 100644 (file)
--- 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\r
 
 blablabla
-
 </data>
 </reply>
 

diff --git a/tests/data/test4 b/tests/data/test4
index cf2a64a5c91acdcb24818b5bfd0b4ce43327cbd4..2c84c7940d0f9b5f657f12ce9d94db402eed2779 100644 (file)
--- a/tests/data/test4
+++ b/tests/data/test4
@@ -4,7 +4,7 @@
 <data>
 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 bbf111d6a9e4ac648ea9b82bdcf6ed37e6dcd5d2..7686bdc87b336f0e0f933724c377c75895085a01 100644 (file)
--- a/tests/data/test40
+++ b/tests/data/test40
@@ -2,14 +2,14 @@
 # Server-side
 <reply>
 <data>
-HTTP/1.1 302 OK\r
+HTTP/1.1 302 OK swsclose\r
 Location: ../moo.html/?name=d a niel&testcase=/400002    \r
 Date: Thu, 09 Nov 2010 14:49:00 GMT\r
 Connection: close\r
 \r
 </data>
 <data2>
-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
 </data2>
 <datacheck>
-HTTP/1.1 302 OK\r
+HTTP/1.1 302 OK swsclose\r
 Location: ../moo.html/?name=d a niel&testcase=/400002    \r
 Date: Thu, 09 Nov 2010 14:49:00 GMT\r
 Connection: close\r
 \r
-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 eec7f451ac0fa24787de927aaa5da25138faf6ee..8843b2a54526e7c5f07663bb259e0ce61bec5e93 100644 (file)
--- a/tests/data/test42
+++ b/tests/data/test42
@@ -2,14 +2,14 @@
 # Server-side
 <reply>
 <data>
-HTTP/1.1 302 OK\r
+HTTP/1.1 302 OK swsclose\r
 Location: ../m o o.html/420002    \r
 Date: Thu, 09 Nov 2010 14:49:00 GMT\r
 Connection: close\r
 \r
 </data>
 <data2>
-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
 </data2>
 <datacheck>
-HTTP/1.1 302 OK\r
+HTTP/1.1 302 OK swsclose\r
 Location: ../m o o.html/420002    \r
 Date: Thu, 09 Nov 2010 14:49:00 GMT\r
 Connection: close\r
 \r
-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 adef3bdd130e9283c6c5982b78befb8ac423eff1..ba40db061d1d961f9dfd4d423ceb937b45cb82b7 100644 (file)
--- 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
 
 </data>
 <data2>
-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
  </name>
  <command>
-http://%HOSTIP:%HOSTPORT/want/11 -L -x %HOSTIP:%HOSTPORT
+http://%HOSTIP:%HOSTPORT/want/43 -L -x %HOSTIP:%HOSTPORT
 </command>
 </test>
 
@@ -53,12 +53,12 @@ http://%HOSTIP:%HOSTPORT/want/11 -L -x %HOSTIP:%HOSTPORT
 ^User-Agent:.*
 </strip>
 <protocol>
-GET http://127.0.0.1:8999/want/11 HTTP/1.1\r
+GET http://127.0.0.1:8999/want/43 HTTP/1.1\r
 Host: 127.0.0.1:8999\r
 Pragma: no-cache\r
 Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*\r
 \r
-GET http://127.0.0.1:8999/want/data/110002.txt?coolsite=yes HTTP/1.1\r
+GET http://127.0.0.1:8999/want/data/430002.txt?coolsite=yes HTTP/1.1\r
 Host: 127.0.0.1:8999\r
 Pragma: no-cache\r
 Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*\r

diff --git a/tests/data/test44 b/tests/data/test44
index 0460df5f3064d824ca3198671f36593c3695af93..3af86ebe5745bee861df5027b1447db055f86649 100644 (file)
--- a/tests/data/test44
+++ b/tests/data/test44
@@ -1,7 +1,7 @@
 # Server-side
 <reply>
 <data>
-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 9897007ea890ec73783fc921188e4c0eb2e522d9..dbc443b915dbb5c7dc785d8421ffddc639d6b45a 100644 (file)
--- a/tests/data/test45
+++ b/tests/data/test45
@@ -1,17 +1,17 @@
 # Server-side
 <reply>
 <data>
-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
 
 </data>
 <data2>
-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
 
 </data2>
 <datacheck>
-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\r
 Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*\r
 \r
-GET /want/data.cgi?moo=http://&/110002 HTTP/1.1\r
+GET /want/data.cgi?moo=http://&/450002 HTTP/1.1\r
 Host: 127.0.0.1:8999\r
 Pragma: no-cache\r
 Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*\r

diff --git a/tests/data/test46 b/tests/data/test46
index b4ff3e6b60ae1a4f1cbd6ea6f71a935d6f790ec2..5ed2fc6a0d028fdef3c99e389a6b426378ae07ed 100644 (file)
--- 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\r
 
 This server reply is for testing a simple Location: following
-
 </data>
 </reply>
 

diff --git a/tests/data/test47 b/tests/data/test47
index 2a33593724cc733b477a15d87b36b2a49136ff0e..968967d8b491fd233f56732a8fa55c970151c3ca 100644 (file)
--- a/tests/data/test47
+++ b/tests/data/test47
@@ -2,7 +2,7 @@
 # Server-side
 <reply name="47">
 <data>
-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 b9c3419fba8832fd85964358ee396b07f3435a0c..4c998772c5f5bd9598076cd3c34adb041323e6e7 100644 (file)
--- a/tests/data/test49
+++ b/tests/data/test49
@@ -2,14 +2,14 @@
 # Server-side
 <reply>
 <data>
-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
 
 </data>
 <data2>
-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
 </data2>
 <datacheck>
-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 c04c66a82fc7daf33c69ae1beed9231e478e5ec7..0ca47bb5b89986df8d02e995c20d2b02fe1d75b3 100644 (file)
--- a/tests/data/test5
+++ b/tests/data/test5
@@ -4,7 +4,7 @@
 <data>
 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 38b274b922a6eecd7ea89c5cedb76bbf54ba4338..eb9fd12861ac6a251e052fac44c6a9418e284050 100644 (file)
--- a/tests/data/test50
+++ b/tests/data/test50
@@ -2,14 +2,14 @@
 # Server-side
 <reply>
 <data>
-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
 
 </data>
 <data2>
-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
 </data2>
 <datacheck>
-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 4c62bca4eea762b6cd959ea494a88f95c2387d70..bd8607fb9182bc68ac6766739e74ff045bfb0a57 100644 (file)
--- a/tests/data/test502
+++ b/tests/data/test502
@@ -3,7 +3,7 @@
 <reply>
 <data>
 foo
-   bar
+   bar swsclose
 bar
    foo
 moo
@@ -28,7 +28,7 @@ file://%PWD/log/test502.txt
 </command>
 <file name="log/test502.txt">
 foo
-   bar
+   bar swsclose
 bar
    foo
 moo

diff --git a/tests/data/test503 b/tests/data/test503
index 5792a3803ba90fb79a171c5a8a7870c340a5a976..c81fbeda81be484b20a402a56139e20564b2c8b4 100644 (file)
--- a/tests/data/test503
+++ b/tests/data/test503
@@ -1,7 +1,7 @@
 # Server-side
 <reply>
 <data>
-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
  <command>
 http://%HOSTIP:%HTTPSPORT/503 localhost:%HOSTPORT
 </command>
-<file name="log/test502.txt">
+<file name="log/test503.txt">
 foo
    bar
 bar

diff --git a/tests/data/test51 b/tests/data/test51
index 717a5e016e4503ee359d4d5d1dc422dc1d17c54c..609414f78a9c1a15425ca0cc1a03a3dd47bd8158 100644 (file)
--- a/tests/data/test51
+++ b/tests/data/test51
@@ -2,14 +2,14 @@
 # Server-side
 <reply>
 <data>
-HTTP/1.1 302 OK
+HTTP/1.1 302 OK swsclose
 Location: ../../../../../../../510002
 Date: Thu, 09 Nov 2010 14:50:00 GMT
 Connection: close
 
 </data>
 <data2>
-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
 </data2>
 <datacheck>
-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 c9ec09e7f2d61a8aea6f12b981cf1185bcb5846c..80084f86cee31f7b6b64e249bcda5670be7f7b8f 100644 (file)
--- a/tests/data/test52
+++ b/tests/data/test52
@@ -2,14 +2,14 @@
 # Server-side
 <reply>
 <data>
-HTTP/1.1 302 OK
+HTTP/1.1 302 OK swsclose
 Location: ./520002
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Connection: close
 
 </data>
 <data2>
-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
 </data2>
 <datacheck>
-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 9ccac219bafb62709bb49dd8421f2a71af2b0a5c..09395f92ea681e5e12e0088148a81161449346d2 100644 (file)
--- 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\r
 
 This server says moo
 </data>

diff --git a/tests/data/test54 b/tests/data/test54
index 5582ee1e97af02f2d96f13044e2e5ce106ebea82..3812ead31b3e49184f705ce3e7e4719d6b8330e7 100644 (file)
--- a/tests/data/test54
+++ b/tests/data/test54
@@ -1,7 +1,7 @@
 # Server-side
 <reply>
 <data>
-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 11e25ae0ad572d2c769743c14d73bfde703935c8..9154b4be8e7d0f2cd0b3c889e7d49288a06cc229 100644 (file)
--- a/tests/data/test55
+++ b/tests/data/test55
@@ -1,25 +1,25 @@
 <reply>
 <data>
-HTTP/1.1 302 OK
+HTTP/1.1 302 OK swsclose
 Location: 550002
 Date: Thu, 09 Nov 2010 14:50:00 GMT
 Connection: close
 
 </data>
 <data2>
-HTTP/1.1 200 OK
+HTTP/1.1 200 OK swsclose
 Date: Thu, 09 Nov 2010 14:50:00 GMT
 Connection: close
 
 body
 </data2>
 <datacheck>
-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 889182a26f679e42442b97b8cefd6fb0b4466c38..78e29f62e104097264015210f98b5fa271bed685 100644 (file)
--- a/tests/data/test56
+++ b/tests/data/test56
@@ -1,7 +1,7 @@
 # Server-side
 <reply>
 <data>
-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 e091a39cbe2b3f7ab9b4ab5837ab2f885fce76e1..397619526cf61f5974e3a917f0f44a3c870c4baf 100644 (file)
--- a/tests/data/test57
+++ b/tests/data/test57
@@ -1,7 +1,7 @@
 # Server-side
 <reply>
 <data>
-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 b7f413d5b0364cadc7931b2b30bb129ebcd84fb1..9c8cce898d7329f4384298be1415dcc7ef629fe4 100644 (file)
--- a/tests/data/test58
+++ b/tests/data/test58
@@ -1,7 +1,7 @@
 # Server-side
 <reply>
 <data>
-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 198e4828fcef112fcc718174f401567a2901841f..4e74bcb4f2d9573fe109bef265575eb4f34088be 100644 (file)
--- a/tests/data/test59
+++ b/tests/data/test59
@@ -2,7 +2,7 @@
 # Server-side
 <reply name="1">
 <data>
-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 0e1c3c715a3bf980b7e5e52f7e1a68ffcb39096e..c16141cb1afb97414b3ecc7da00f0096c21bec27 100644 (file)
--- 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
 
 </data>
 </reply>

diff --git a/tests/data/test60 b/tests/data/test60
index 623dbe1f00e934575c0fd050352a4b28cd057b01..1f9403a2b0f8e1da47ef78980dfd73d95a68cb88 100644 (file)
--- a/tests/data/test60
+++ b/tests/data/test60
@@ -1,7 +1,7 @@
 # Server-side
 <reply>
 <data>
-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 bf624018e842019c1eab1de33b9526d0ef03b8d2..00cc74d04e19b7e9a9f5ce899e0566bfc3fdbc63 100644 (file)
--- 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\r
 Set-Cookie: test4=no; domain=nope.foo.com; path=/moo; secure\r
 Set-Cookie: test5=name; domain=anything.com; path=/ ; secure\r
+Content-Length: 4\r
 \r
 boo
 </data>

diff --git a/tests/data/test62 b/tests/data/test62
index f1d6c1a2a118e049e4afb6380a3555a7c354a8de..e29c3d7b52839dab594fb3c35c84f08aae5a8e71 100644 (file)
--- a/tests/data/test62
+++ b/tests/data/test62
@@ -1,7 +1,7 @@
 # Server-side
 <reply>
 <data>
-HTTP/1.1 200 OK\r
+HTTP/1.1 200 OK swsclose\r
 Date: Thu, 09 Nov 2010 14:49:00 GMT\r
 Content-Type: text/html\r
 \r

diff --git a/tests/data/test63 b/tests/data/test63
index 040235ee0adae59e673afc22a9871535939b8a74..cb44e0de7b70b013066ee794a9fa1449df60d81f 100644 (file)
--- a/tests/data/test63
+++ b/tests/data/test63
@@ -1,7 +1,7 @@
 # Server-side
 <reply>
 <data>
-HTTP/1.1 200 OK\r
+HTTP/1.1 200 OK swsclose\r
 Date: Thu, 09 Nov 2010 14:49:00 GMT\r
 Content-Type: text/html\r
 \r

diff --git a/tests/data/test64 b/tests/data/test64
index 3c88fa4f8300833a9dfad0415807994a4435298c..5fd42e464a472336a563d1bf4336b3bb61ce2b14 100644 (file)
--- a/tests/data/test64
+++ b/tests/data/test64
@@ -1,7 +1,7 @@
 # Server-side
 <reply>
 <data>
-HTTP/1.1 401 Authorization Required\r
+HTTP/1.1 401 Authorization Required swsclose\r
 Server: Apache/1.3.27 (Darwin) PHP/4.1.2\r
 WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"\r
 Content-Type: text/html; charset=iso-8859-1\r
@@ -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
 <data1000>
-HTTP/1.1 200 OK\r
+HTTP/1.1 200 OK swsclose\r
 Server: Apache/1.3.27 (Darwin) PHP/4.1.2\r
 Content-Type: text/html; charset=iso-8859-1\r
 \r
@@ -20,12 +20,12 @@ This IS the real page!
 </data1000>
 
 <datacheck>
-HTTP/1.1 401 Authorization Required\r
+HTTP/1.1 401 Authorization Required swsclose\r
 Server: Apache/1.3.27 (Darwin) PHP/4.1.2\r
 WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"\r
 Content-Type: text/html; charset=iso-8859-1\r
 \r
-HTTP/1.1 200 OK\r
+HTTP/1.1 200 OK swsclose\r
 Server: Apache/1.3.27 (Darwin) PHP/4.1.2\r
 Content-Type: text/html; charset=iso-8859-1\r
 \r

diff --git a/tests/data/test65 b/tests/data/test65
index a1280cb999a197e6a604dbae66a9011fc7d05c5c..e6445c57083ebded6b39bdfca9e7103489850f0c 100644 (file)
--- 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\r
 WWW-Authenticate: Digest realm="testrealm", nonce="2053604145"\r
 Content-Type: text/html; charset=iso-8859-1\r
+Content-Length: 26\r
 \r
 This is not the real page
 </data>
@@ -15,6 +16,7 @@ This is not the real page
 HTTP/1.1 401 Still a bad password you moron\r
 Server: Apache/1.3.27 (Darwin) PHP/4.1.2\r
 Content-Type: text/html; charset=iso-8859-1\r
+Content-Length: 34\r
 \r
 This is not the real page either\r
 </data1000>
@@ -24,10 +26,12 @@ HTTP/1.1 401 Authorization Required
 Server: Apache/1.3.27 (Darwin) PHP/4.1.2\r
 WWW-Authenticate: Digest realm="testrealm", nonce="2053604145"\r
 Content-Type: text/html; charset=iso-8859-1\r
+Content-Length: 26\r
 \r
 HTTP/1.1 401 Still a bad password you moron\r
 Server: Apache/1.3.27 (Darwin) PHP/4.1.2\r
 Content-Type: text/html; charset=iso-8859-1\r
+Content-Length: 34\r
 \r
 This is not the real page either\r
 </datacheck>

diff --git a/tests/data/test66 b/tests/data/test66
index 45ac2f1440724570db7422d715b0a4b6927cb0e0..cfc3214b6b818b91960293572e5949fb124bc6ba 100644 (file)
--- a/tests/data/test66
+++ b/tests/data/test66
@@ -1,7 +1,7 @@
 # Server-side
 <reply>
 <data>
-no headers
+no headers swsclose
 </data>
 </reply>
 

diff --git a/tests/data/test67 b/tests/data/test67
index ece249ef21253f20a023d4806f6798c7e2f8a118..ae92276b31b6123c90f55f12f0fc1c0205ad23e2 100644 (file)
--- a/tests/data/test67
+++ b/tests/data/test67
@@ -9,6 +9,7 @@
 HTTP/1.1 401 Now gimme that second request of crap\r
 Server: Microsoft-IIS/5.0\r
 Content-Type: text/html; charset=iso-8859-1\r
+Content-Length: 34\r
 WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==\r
 \r
 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
 <data1002>
-HTTP/1.1 200 Things are fine in server land\r
+HTTP/1.1 200 Things are fine in server land swsclose\r
 Server: Microsoft-IIS/5.0\r
 Content-Type: text/html; charset=iso-8859-1\r
 \r
@@ -28,9 +29,10 @@ Finally, this is the real page!
 HTTP/1.1 401 Now gimme that second request of crap\r
 Server: Microsoft-IIS/5.0\r
 Content-Type: text/html; charset=iso-8859-1\r
+Content-Length: 34\r
 WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==\r
 \r
-HTTP/1.1 200 Things are fine in server land\r
+HTTP/1.1 200 Things are fine in server land swsclose\r
 Server: Microsoft-IIS/5.0\r
 Content-Type: text/html; charset=iso-8859-1\r
 \r

diff --git a/tests/data/test68 b/tests/data/test68
index bd68e3ce843d7ca8e77e7fd321be100b2d7fff48..0eab3d76b250d62fce84073ae86ed8c32e819a89 100644 (file)
--- a/tests/data/test68
+++ b/tests/data/test68
@@ -6,6 +6,7 @@
 <data1001>
 HTTP/1.1 401 Now gimme that second request of crap\r
 Server: Microsoft-IIS/5.0\r
+Content-Length: 34\r
 Content-Type: text/html; charset=iso-8859-1\r
 WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==\r
 \r
@@ -18,6 +19,7 @@ This is not the real page either!
 HTTP/1.1 401 You give me wrong password\r
 Server: Microsoft-IIS/5.0\r
 WWW-Authenticate: NTLM\r
+Content-Length: 46\r
 Content-Type: text/html; charset=iso-8859-1\r
 \r
 Wrong password dude. Get it fixed and return.
@@ -26,12 +28,14 @@ Wrong password dude. Get it fixed and return.
 <datacheck>
 HTTP/1.1 401 Now gimme that second request of crap\r
 Server: Microsoft-IIS/5.0\r
+Content-Length: 34\r
 Content-Type: text/html; charset=iso-8859-1\r
 WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==\r
 \r
 HTTP/1.1 401 You give me wrong password\r
 Server: Microsoft-IIS/5.0\r
 WWW-Authenticate: NTLM\r
+Content-Length: 46\r
 Content-Type: text/html; charset=iso-8859-1\r
 \r
 Wrong password dude. Get it fixed and return.

diff --git a/tests/data/test69 b/tests/data/test69
index daf7c4d9f075d0e0e1d599315f246896a2fa9a20..087783fe0f8dff1586d5fc56fb05b22e4042887e 100644 (file)
--- a/tests/data/test69
+++ b/tests/data/test69
@@ -1,7 +1,7 @@
 # Server-side
 <reply>
 <data>
-HTTP/1.1 401 Authorization Required\r
+HTTP/1.1 401 Authorization Required swsclose\r
 Server: Apache/1.3.27 (Darwin) PHP/4.1.2\r
 WWW-Authenticate: Basic\r
 WWW-Authenticate: Wild-and-crazy\r
@@ -16,6 +16,7 @@ This is not the real page
 <data1001>
 HTTP/1.1 401 Now gimme that second request of crap\r
 Server: Microsoft-IIS/5.0\r
+Content-Length: 34\r
 Content-Type: text/html; charset=iso-8859-1\r
 WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==\r
 \r
@@ -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
 <data1002>
-HTTP/1.1 200 Things are fine in server land\r
+HTTP/1.1 200 Things are fine in server land swsclose\r
 Server: Microsoft-IIS/5.0\r
 Content-Type: text/html; charset=iso-8859-1\r
 \r
@@ -33,7 +34,7 @@ Finally, this is the real page!
 </data1002>
 
 <datacheck>
-HTTP/1.1 401 Authorization Required\r
+HTTP/1.1 401 Authorization Required swsclose\r
 Server: Apache/1.3.27 (Darwin) PHP/4.1.2\r
 WWW-Authenticate: Basic\r
 WWW-Authenticate: Wild-and-crazy\r
@@ -42,10 +43,11 @@ Content-Type: text/html; charset=iso-8859-1
 \r
 HTTP/1.1 401 Now gimme that second request of crap\r
 Server: Microsoft-IIS/5.0\r
+Content-Length: 34\r
 Content-Type: text/html; charset=iso-8859-1\r
 WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==\r
 \r
-HTTP/1.1 200 Things are fine in server land\r
+HTTP/1.1 200 Things are fine in server land swsclose\r
 Server: Microsoft-IIS/5.0\r
 Content-Type: text/html; charset=iso-8859-1\r
 \r

diff --git a/tests/data/test7 b/tests/data/test7
index 5299529a5f962b88728b7b87257849bcc5a229b9..d7c656a7c93023df797d0a8e1a7361028c8e5ac2 100644 (file)
--- 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 eaa65d00d1288d3679ad1a16158ca0bceb3d3455..b2d5f863b428707b3ba55ffb3e64a7173deef492 100644 (file)
--- 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"\r
 WWW-Authenticate: NTLM\r
 Content-Type: text/html; charset=iso-8859-1\r
+Content-Length: 26\r
 \r
 This is not the real page
 </data>
@@ -16,6 +17,7 @@ This is not the real page
 HTTP/1.1 200 OK\r
 Server: Apache/1.3.27 (Darwin) PHP/4.1.2\r
 Content-Type: text/html; charset=iso-8859-1\r
+Content-Length: 23\r
 \r
 This IS the real page!
 </data1000>
@@ -26,10 +28,12 @@ Server: Apache/1.3.27 (Darwin) PHP/4.1.2
 WWW-Authenticate: Digest realm="testrealm", nonce="1053604199"\r
 WWW-Authenticate: NTLM\r
 Content-Type: text/html; charset=iso-8859-1\r
+Content-Length: 26\r
 \r
 HTTP/1.1 200 OK\r
 Server: Apache/1.3.27 (Darwin) PHP/4.1.2\r
 Content-Type: text/html; charset=iso-8859-1\r
+Content-Length: 23\r
 \r
 This IS the real page!
 </datacheck>

diff --git a/tests/data/test8 b/tests/data/test8
index 5ee7fc857d832d5e8ca32452a32f6676f00eaff8..da68b748ebc7cf2ecea9d9712c85a2a87027b56d 100644 (file)
--- a/tests/data/test8
+++ b/tests/data/test8
@@ -1,7 +1,7 @@
 # Server-side
 <reply>
 <data>
-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 3eb6f48785aedacc3ea4e75a1801844ea4827ea2..b2d5c9299714b11dbaeb56fc024e767932cf29c6 100644 (file)
--- a/tests/data/test9
+++ b/tests/data/test9
@@ -1,7 +1,7 @@
 # Server-side
 <reply>
 <data>
-HTTP/1.1 200 OK
+HTTP/1.1 200 OK swsclose
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake