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

HTTP server

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
 

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
 

tests/data/test13

@@ -2,10 +2,10 @@
 <reply>
 <data>
 HTTP/1.1 200 Read you
+Content-Length: 29
 Deleted: suppose we got a header like this! ;-)
 
 blabla custom request result
-
 </data>
 </reply>
 

tests/data/test15

@@ -5,6 +5,7 @@ HTTP/1.4 200 OK
 Fake: yes
 Fake: yes
 Fake: yes
+Content-Length: 26
 
 Repeated nonsense-headers
 </data>
@@ -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

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
 </data>

tests/data/test17

@@ -3,6 +3,7 @@
 <data>
 HTTP/1.1 200 OK
 Funny-head: yesyes
+Content-Length: 27
 
 This is the proof it works
 </data>

tests/data/test18

@@ -3,18 +3,21 @@
 <data nocheck=1>
 HTTP/1.1 200 OK
 Funny-head: yesyes
+Content-Length: 4
 
 moo
 </data>
 <data2>
 HTTP/1.1 200 OK
 Funny-head: yesyes
+Content-Length: 4
 
 foo
 </data2>
 <data3>
 HTTP/1.1 200 OK
 Funny-head: yesyes
+Content-Length: 4
 
 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
 
 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
 </stdout>

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
 

tests/data/test22

@@ -3,6 +3,7 @@
 <data>
 HTTP/1.1 200 OK
 Funny-head: yesyes
+Content-Length: 27
 
 This is the proof it works
 </data>

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
 

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;
 

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
 

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
 

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
+GET /301 HTTP/1.1
 Authorization: Basic ZmFrZTp1c2Vy
 Host: 127.0.0.1:8433
 Pragma: no-cache

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
-
 </data>
 </reply>
 

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
 

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

tests/data/test33

@@ -1,6 +1,7 @@
 # Server-side
 <reply>
 <data>
+HTTP/1.1 OK swsclose
 
 </data>
 </reply>

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
-
 </data>
 </reply>
 

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
 

tests/data/test40

@@ -2,14 +2,14 @@
 # Server-side
 <reply>
 <data>
-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
 
 </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/?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

tests/data/test42

@@ -2,14 +2,14 @@
 # Server-side
 <reply>
 <data>
-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
 
 </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: ../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

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
+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, */*

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
 

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
 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, */*

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
-
 </data>
 </reply>
 

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
 

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

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
 

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

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

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

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

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

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
 </data>

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:  
 

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
 

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

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   
 

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
 

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
 

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>

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
 

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
 </data>

tests/data/test62

@@ -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
 Content-Type: text/html
 

tests/data/test63

@@ -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
 Content-Type: text/html
 

tests/data/test64

@@ -1,7 +1,7 @@
 # Server-side
 <reply>
 <data>
-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
 <data1000>
-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!
 </data1000>
 
 <datacheck>
-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
 

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
 </data>
@@ -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
 </data1000>
@@ -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
 </datacheck>

tests/data/test66

@@ -1,7 +1,7 @@
 # Server-side
 <reply>
 <data>
-no headers
+no headers swsclose
 </data>
 </reply>
 

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
 <data1002>
-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
 

tests/data/test68

@@ -6,6 +6,7 @@
 <data1001>
 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.
 <datacheck>
 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.

tests/data/test69

@@ -1,7 +1,7 @@
 # Server-side
 <reply>
 <data>
-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
 <data1001>
 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
 <data1002>
-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!
 </data1002>
 
 <datacheck>
-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
 

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=/;

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
 </data>
@@ -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!
 </data1000>
@@ -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!
 </datacheck>

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
 

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