testsuite: changed HTTP and RTSP header line-endings to CRLF

According to RFC 2616 and RFC 2326 individual protocol elements, like
headers and except the actual content, are terminated by using CRLF.

Therefore the test data files for these protocols need to contain
mixed line-endings if the actual protocol elements use CRLF while
the file uses LF.

diff --git a/tests/data/test1500 b/tests/data/test1500
index 0a5919ca84f088302c53f7c4d66a08fe07f99e90..cd3131e6d243ede2ac6df2997ab8a620f368be58 100644 (file)
--- a/tests/data/test1500
+++ b/tests/data/test1500
@@ -10,13 +10,13 @@ multi
 # Server-side
 <reply>
 <data>
-HTTP/1.1 200 all good!
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Type: text/html
-Content-Length: 12
-Connection: close
-
+HTTP/1.1 200 all good!\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Type: text/html\r
+Content-Length: 12\r
+Connection: close\r
+\r
 Hello World
 </data>
 </reply>

diff --git a/tests/data/test1502 b/tests/data/test1502
index ac9e048a10289c42d8c4605004e3e1f5c83c854d..4c084d644f2780f384fe3a8fe9669b82b6b2fb4b 100644 (file)
--- a/tests/data/test1502
+++ b/tests/data/test1502
@@ -10,17 +10,17 @@ CURLOPT_RESOLVE
 
 <reply>
 <data>
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-ETag: "21025-dc7-39462498"
-Accept-Ranges: bytes
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Funny-head: yesyes
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT\r
+ETag: "21025-dc7-39462498"\r
+Accept-Ranges: bytes\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+Funny-head: yesyes\r
+\r
 -foo-
 </data>
 </reply>

diff --git a/tests/data/test1503 b/tests/data/test1503
index 66bf3fae2c4a5863101f2a30b0fa5ff528207595..8665de60c0a10cccce3a188add14a04fec8142b1 100644 (file)
--- a/tests/data/test1503
+++ b/tests/data/test1503
@@ -10,17 +10,17 @@ CURLOPT_RESOLVE
 
 <reply>
 <data>
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-ETag: "21025-dc7-39462498"
-Accept-Ranges: bytes
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Funny-head: yesyes
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT\r
+ETag: "21025-dc7-39462498"\r
+Accept-Ranges: bytes\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+Funny-head: yesyes\r
+\r
 -foo-
 </data>
 </reply>

diff --git a/tests/data/test1504 b/tests/data/test1504
index cedc9cce00d2ffb51ef307d2d7b612ce7f38a9c3..b8463c526c3b38ded0ef012cb6550044bd6c84f6 100644 (file)
--- a/tests/data/test1504
+++ b/tests/data/test1504
@@ -10,17 +10,17 @@ CURLOPT_RESOLVE
 
 <reply>
 <data>
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-ETag: "21025-dc7-39462498"
-Accept-Ranges: bytes
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Funny-head: yesyes
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT\r
+ETag: "21025-dc7-39462498"\r
+Accept-Ranges: bytes\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+Funny-head: yesyes\r
+\r
 -foo-
 </data>
 </reply>

diff --git a/tests/data/test1505 b/tests/data/test1505
index 3ab52849b9a5f3218afe603a227cf7012b3dff1e..c6e5a7ca1b9e47d15bd3b5b584e9cbb71b5bc908 100644 (file)
--- a/tests/data/test1505
+++ b/tests/data/test1505
@@ -10,17 +10,17 @@ CURLOPT_RESOLVE
 
 <reply>
 <data>
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-ETag: "21025-dc7-39462498"
-Accept-Ranges: bytes
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Funny-head: yesyes
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT\r
+ETag: "21025-dc7-39462498"\r
+Accept-Ranges: bytes\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+Funny-head: yesyes\r
+\r
 -foo-
 </data>
 </reply>

diff --git a/tests/data/test1506 b/tests/data/test1506
index 6874eaf5804e151c18978f3917de381cec7505e2..815fef9233b0c2517997a7df7dfb99cfebe8860e 100644 (file)
--- a/tests/data/test1506
+++ b/tests/data/test1506
@@ -10,35 +10,35 @@ verbose logs
 # Server-side
 <reply>
 <data1>
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 47
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 47\r
+\r
 file contents should appear once for each file
 </data1>
 <data2>
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 47
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 47\r
+\r
 file contents should appear once for each file
 </data2>
 <data3>
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 47
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 47\r
+\r
 file contents should appear once for each file
 </data3>
 <data4>
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 47
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 47\r
+\r
 file contents should appear once for each file
 </data4>
 </reply>

diff --git a/tests/data/test1509 b/tests/data/test1509
index dd68b05d14cd5469bbc6be2a0e9ee4349bda91ee..b4bfc660309257389df48fbb57bba3ebaf898efb 100644 (file)
--- a/tests/data/test1509
+++ b/tests/data/test1509
@@ -21,25 +21,25 @@ Server: the beast that eats naughty clients
 </connect>
 
 <data>
-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
-ETag: "21025-dc7-39462498"
-
+HTTP/1.1 200 OK swsclose\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT\r
+ETag: "21025-dc7-39462498"\r
+\r
 </data>
 <datacheck>
 HTTP/1.1 200 Mighty fine indeed\r
 Server: the beast that eats naughty clients\r
 \r
-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
-ETag: "21025-dc7-39462498"
-
-header length is ........: 239
-header length should be..: 239
+HTTP/1.1 200 OK swsclose\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT\r
+ETag: "21025-dc7-39462498"\r
+\r
+header length is ........: 245
+header length should be..: 245
 </datacheck>
 </reply>
 

diff --git a/tests/data/test1510 b/tests/data/test1510
index ffa99c5eae6859acde322d7c370eb9742e31cab5..fdf6c7dbd9cf65fac6f45ae1a2e58084617ab892 100644 (file)
--- a/tests/data/test1510
+++ b/tests/data/test1510
@@ -9,35 +9,35 @@ verbose logs
 # Server-side
 <reply>
 <data1>
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 47
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 47\r
+\r
 file contents should appear once for each file
 </data1>
 <data2>
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 47
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 47\r
+\r
 file contents should appear once for each file
 </data2>
 <data3>
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 47
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 47\r
+\r
 file contents should appear once for each file
 </data3>
 <data4>
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 47
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 47\r
+\r
 file contents should appear once for each file
 </data4>
 </reply>

diff --git a/tests/data/test1512 b/tests/data/test1512
index 9d2134b2a7f5acb13f61a1156b2305c525d5c011..a5de5cda7d130aa01904afe4defc6858492410c8 100644 (file)
--- a/tests/data/test1512
+++ b/tests/data/test1512
@@ -9,35 +9,35 @@ GLOBAL DNS CACHE
 # Server-side
 <reply>
 <data1>
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 47
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 47\r
+\r
 file contents should appear once for each file
 </data1>
 <data2>
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 47
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 47\r
+\r
 file contents should appear once for each file
 </data2>
 <data3>
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 47
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 47\r
+\r
 file contents should appear once for each file
 </data3>
 <data4>
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 47
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 47\r
+\r
 file contents should appear once for each file
 </data4>
 </reply>

diff --git a/tests/data/test1514 b/tests/data/test1514
index 4619a20681d17dccbb9f609b70fcb97a2a8d537d..38f5da61f8151d441b9012ff5d5e3b73017d5a3d 100644 (file)
--- a/tests/data/test1514
+++ b/tests/data/test1514
@@ -10,10 +10,10 @@ Content-Length
 # Server-side
 <reply>
 <data nocheck="yes">
-HTTP/1.1 411 Length Required
-Date: Sun, 19 Jan 2014 18:50:58 GMT
-Server: test-server/fake swsclose
-Connection: close
+HTTP/1.1 411 Length Required\r
+Date: Sun, 19 Jan 2014 18:50:58 GMT\r
+Server: test-server/fake swsclose\r
+Connection: close\r
 </data>
 </reply>
 

diff --git a/tests/data/test2032 b/tests/data/test2032
index 30b7f72a530fae154a5140f76c0913a73728f1e3..23f44e638ae27fdb0673ba00261110b9877a8a6b 100644 (file)
--- a/tests/data/test2032
+++ b/tests/data/test2032
@@ -12,75 +12,75 @@ HTTP NTLM auth
 
 <!-- Basic auth -->
 <data100>
-HTTP/1.1 401 Need Basic or NTLM auth
-Server: Microsoft-IIS/5.0
-Content-Type: text/html; charset=iso-8859-1
-Content-Length: 29
-WWW-Authenticate: NTLM
-WWW-Authenticate: Basic realm="testrealm"
-
+HTTP/1.1 401 Need Basic or NTLM auth\r
+Server: Microsoft-IIS/5.0\r
+Content-Type: text/html; charset=iso-8859-1\r
+Content-Length: 29\r
+WWW-Authenticate: NTLM\r
+WWW-Authenticate: Basic realm="testrealm"\r
+\r
 This is a bad password page!
 </data100>
 
 <!-- NTML auth -->
 <data200>
-HTTP/1.1 401 Need Basic or NTLM auth (2)
-Server: Microsoft-IIS/5.0
-Content-Type: text/html; charset=iso-8859-1
-Content-Length: 27
-WWW-Authenticate: NTLM
-WWW-Authenticate: Basic realm="testrealm"
-
+HTTP/1.1 401 Need Basic or NTLM auth (2)\r
+Server: Microsoft-IIS/5.0\r
+Content-Type: text/html; charset=iso-8859-1\r
+Content-Length: 27\r
+WWW-Authenticate: NTLM\r
+WWW-Authenticate: Basic realm="testrealm"\r
+\r
 This is not the real page!
 </data200>
 
 <data1201>
-HTTP/1.1 401 NTLM intermediate (2)
-Server: Microsoft-IIS/5.0
-Content-Type: text/html; charset=iso-8859-1
-Content-Length: 33
-WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAAAGggEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
+HTTP/1.1 401 NTLM intermediate (2)\r
+Server: Microsoft-IIS/5.0\r
+Content-Type: text/html; charset=iso-8859-1\r
+Content-Length: 33\r
+WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAAAGggEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=\r
+\r
 This is still not the real page!
 </data1201>
 
 <data1202>
-HTTP/1.1 200 Things are fine in server land
-Server: Microsoft-IIS/5.0
-Content-Type: text/html; charset=iso-8859-1
-Content-Length: 32
-
+HTTP/1.1 200 Things are fine in server land\r
+Server: Microsoft-IIS/5.0\r
+Content-Type: text/html; charset=iso-8859-1\r
+Content-Length: 32\r
+\r
 Finally, this is the real page!
 </data1202>
 
 <datacheck>
-HTTP/1.1 401 Need Basic or NTLM auth
-Server: Microsoft-IIS/5.0
-Content-Type: text/html; charset=iso-8859-1
-Content-Length: 29
-WWW-Authenticate: NTLM
-WWW-Authenticate: Basic realm="testrealm"
-
+HTTP/1.1 401 Need Basic or NTLM auth\r
+Server: Microsoft-IIS/5.0\r
+Content-Type: text/html; charset=iso-8859-1\r
+Content-Length: 29\r
+WWW-Authenticate: NTLM\r
+WWW-Authenticate: Basic realm="testrealm"\r
+\r
 This is a bad password page!
-HTTP/1.1 401 Need Basic or NTLM auth
-Server: Microsoft-IIS/5.0
-Content-Type: text/html; charset=iso-8859-1
-Content-Length: 29
-WWW-Authenticate: NTLM
-WWW-Authenticate: Basic realm="testrealm"
-
+HTTP/1.1 401 Need Basic or NTLM auth\r
+Server: Microsoft-IIS/5.0\r
+Content-Type: text/html; charset=iso-8859-1\r
+Content-Length: 29\r
+WWW-Authenticate: NTLM\r
+WWW-Authenticate: Basic realm="testrealm"\r
+\r
 This is a bad password page!
-HTTP/1.1 401 NTLM intermediate (2)
-Server: Microsoft-IIS/5.0
-Content-Type: text/html; charset=iso-8859-1
-Content-Length: 33
-WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAAAGggEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
-HTTP/1.1 200 Things are fine in server land
-Server: Microsoft-IIS/5.0
-Content-Type: text/html; charset=iso-8859-1
-Content-Length: 32
-
+HTTP/1.1 401 NTLM intermediate (2)\r
+Server: Microsoft-IIS/5.0\r
+Content-Type: text/html; charset=iso-8859-1\r
+Content-Length: 33\r
+WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAAAGggEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=\r
+\r
+HTTP/1.1 200 Things are fine in server land\r
+Server: Microsoft-IIS/5.0\r
+Content-Type: text/html; charset=iso-8859-1\r
+Content-Length: 32\r
+\r
 Finally, this is the real page!
 </datacheck>
 

diff --git a/tests/data/test2033 b/tests/data/test2033
index df9ac357e3fb25c45b8ecf47fa70f092d3a7e9ec..aacbe5e081f97537323026e861c8b752273eba23 100644 (file)
--- a/tests/data/test2033
+++ b/tests/data/test2033
@@ -13,75 +13,75 @@ pipelining
 
 <!-- Basic auth -->
 <data100>
-HTTP/1.1 401 Need Basic or NTLM auth
-Server: Microsoft-IIS/5.0
-Content-Type: text/html; charset=iso-8859-1
-Content-Length: 29
-WWW-Authenticate: NTLM
-WWW-Authenticate: Basic realm="testrealm"
-
+HTTP/1.1 401 Need Basic or NTLM auth\r
+Server: Microsoft-IIS/5.0\r
+Content-Type: text/html; charset=iso-8859-1\r
+Content-Length: 29\r
+WWW-Authenticate: NTLM\r
+WWW-Authenticate: Basic realm="testrealm"\r
+\r
 This is a bad password page!
 </data100>
 
 <!-- NTML auth -->
 <data200>
-HTTP/1.1 401 Need Basic or NTLM auth (2)
-Server: Microsoft-IIS/5.0
-Content-Type: text/html; charset=iso-8859-1
-Content-Length: 27
-WWW-Authenticate: NTLM
-WWW-Authenticate: Basic realm="testrealm"
-
+HTTP/1.1 401 Need Basic or NTLM auth (2)\r
+Server: Microsoft-IIS/5.0\r
+Content-Type: text/html; charset=iso-8859-1\r
+Content-Length: 27\r
+WWW-Authenticate: NTLM\r
+WWW-Authenticate: Basic realm="testrealm"\r
+\r
 This is not the real page!
 </data200>
 
 <data1201>
-HTTP/1.1 401 NTLM intermediate (2)
-Server: Microsoft-IIS/5.0
-Content-Type: text/html; charset=iso-8859-1
-Content-Length: 33
-WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAAAGggEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
+HTTP/1.1 401 NTLM intermediate (2)\r
+Server: Microsoft-IIS/5.0\r
+Content-Type: text/html; charset=iso-8859-1\r
+Content-Length: 33\r
+WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAAAGggEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=\r
+\r
 This is still not the real page!
 </data1201>
 
 <data1202>
-HTTP/1.1 200 Things are fine in server land
-Server: Microsoft-IIS/5.0
-Content-Type: text/html; charset=iso-8859-1
-Content-Length: 32
-
+HTTP/1.1 200 Things are fine in server land\r
+Server: Microsoft-IIS/5.0\r
+Content-Type: text/html; charset=iso-8859-1\r
+Content-Length: 32\r
+\r
 Finally, this is the real page!
 </data1202>
 
 <datacheck>
-HTTP/1.1 401 Need Basic or NTLM auth
-Server: Microsoft-IIS/5.0
-Content-Type: text/html; charset=iso-8859-1
-Content-Length: 29
-WWW-Authenticate: NTLM
-WWW-Authenticate: Basic realm="testrealm"
-
+HTTP/1.1 401 Need Basic or NTLM auth\r
+Server: Microsoft-IIS/5.0\r
+Content-Type: text/html; charset=iso-8859-1\r
+Content-Length: 29\r
+WWW-Authenticate: NTLM\r
+WWW-Authenticate: Basic realm="testrealm"\r
+\r
 This is a bad password page!
-HTTP/1.1 401 Need Basic or NTLM auth
-Server: Microsoft-IIS/5.0
-Content-Type: text/html; charset=iso-8859-1
-Content-Length: 29
-WWW-Authenticate: NTLM
-WWW-Authenticate: Basic realm="testrealm"
-
+HTTP/1.1 401 Need Basic or NTLM auth\r
+Server: Microsoft-IIS/5.0\r
+Content-Type: text/html; charset=iso-8859-1\r
+Content-Length: 29\r
+WWW-Authenticate: NTLM\r
+WWW-Authenticate: Basic realm="testrealm"\r
+\r
 This is a bad password page!
-HTTP/1.1 401 NTLM intermediate (2)
-Server: Microsoft-IIS/5.0
-Content-Type: text/html; charset=iso-8859-1
-Content-Length: 33
-WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAAAGggEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
-HTTP/1.1 200 Things are fine in server land
-Server: Microsoft-IIS/5.0
-Content-Type: text/html; charset=iso-8859-1
-Content-Length: 32
-
+HTTP/1.1 401 NTLM intermediate (2)\r
+Server: Microsoft-IIS/5.0\r
+Content-Type: text/html; charset=iso-8859-1\r
+Content-Length: 33\r
+WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAAAGggEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=\r
+\r
+HTTP/1.1 200 Things are fine in server land\r
+Server: Microsoft-IIS/5.0\r
+Content-Type: text/html; charset=iso-8859-1\r
+Content-Length: 32\r
+\r
 Finally, this is the real page!
 </datacheck>
 

diff --git a/tests/data/test518 b/tests/data/test518
index 58c8b2cf1db4f07671a0fdaf8c137e4cc9f8f5be..0c8814767ddfb661a5b1541ac30936da5c8bce2d 100644 (file)
--- a/tests/data/test518
+++ b/tests/data/test518
@@ -10,17 +10,17 @@ HTTP GET
 # Server-side
 <reply>
 <data>
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-ETag: "21025-dc7-39462498"
-Accept-Ranges: bytes
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Funny-head: yesyes
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT\r
+ETag: "21025-dc7-39462498"\r
+Accept-Ranges: bytes\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+Funny-head: yesyes\r
+\r
 -foo-
 </data>
 </reply>

diff --git a/tests/data/test522 b/tests/data/test522
index 4ac46ff7557b955a8f5dc3f03684f361f69e422c..5eb114bae4ad4ccd94ff5a7bf75a108ece3f1b6b 100644 (file)
--- a/tests/data/test522
+++ b/tests/data/test522
@@ -11,14 +11,14 @@ CURLOPT_PORT
 # Server-side
 <reply>
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-ETag: "21025-dc7-39462498"
-Accept-Ranges: bytes
-Content-Length: 6
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT\r
+ETag: "21025-dc7-39462498"\r
+Accept-Ranges: bytes\r
+Content-Length: 6\r
+\r
 hello
 </data>
 </reply>

diff --git a/tests/data/test523 b/tests/data/test523
index bae7e6ffa39850c456745f5ff7ead532b99e70e8..22c421ec4dc4561d5e94394d561c7de1c432644b 100644 (file)
--- a/tests/data/test523
+++ b/tests/data/test523
@@ -13,14 +13,14 @@ CURLOPT_PROXY
 # Server-side
 <reply>
 <data nocheck="yes">
-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
-ETag: "21025-dc7-39462498"
-Accept-Ranges: bytes
-Content-Length: 6
-
+HTTP/1.1 200 OK swsclose\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT\r
+ETag: "21025-dc7-39462498"\r
+Accept-Ranges: bytes\r
+Content-Length: 6\r
+\r
 hello
 </data>
 </reply>

diff --git a/tests/data/test528 b/tests/data/test528
index 0a55fd3cf8180689fda8fd80918d4a015848ddff..1d2e415ae4597b8be5923ef99ec9b3aac5217a39 100644 (file)
--- a/tests/data/test528
+++ b/tests/data/test528
@@ -10,11 +10,11 @@ multi
 # Server-side
 <reply>
 <data>
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 47
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 47\r
+\r
 file contents should appear once for each file
 </data>
 <datacheck>

diff --git a/tests/data/test530 b/tests/data/test530
index 09e74217931989438ef91783a22b0e3c8a1d6adb..40182e29923c08a446e1008ced07f8cbacebc978 100644 (file)
--- a/tests/data/test530
+++ b/tests/data/test530
@@ -10,35 +10,35 @@ multi
 # Server-side
 <reply>
 <data1>
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 47
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 47\r
+\r
 file contents should appear once for each file
 </data1>
 <data2>
-HTTP/1.1 200 OK
+HTTP/1.1 200 OK\r
 </data2>
 <data3>
-Date: Thu, 09 Nov 2010 14:49:00 GMT
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
 </data3>
 <data4>
-Server: test-server/fake
-Content-Length: 47
-
+Server: test-server/fake\r
+Content-Length: 47\r
+\r
 file contents should appear once for each file
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 47
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 47\r
+\r
 file contents should appear once for each file
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 47
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 47\r
+\r
 file contents should appear once for each file
 </data4>
 </reply>

diff --git a/tests/data/test537 b/tests/data/test537
index bef8f83b278822f13317d29a673e4cb140cd9e21..14e285f21b17faf742d3493b86110c3e626e21e9 100644 (file)
--- a/tests/data/test537
+++ b/tests/data/test537
@@ -10,17 +10,17 @@ HTTP GET
 # Server-side
 <reply>
 <data>
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-ETag: "21025-dc7-39462498"
-Accept-Ranges: bytes
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Funny-head: yesyes
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT\r
+ETag: "21025-dc7-39462498"\r
+Accept-Ranges: bytes\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+Funny-head: yesyes\r
+\r
 -foo-
 </data>
 </reply>

diff --git a/tests/data/test549 b/tests/data/test549
index e4bd6bf2c2db07d13744e2c7b5ee1d56331469f8..9ef6ec939c60d3c3db09242d04b3fd2f822aec6e 100644 (file)
--- a/tests/data/test549
+++ b/tests/data/test549
@@ -12,14 +12,14 @@ HTTP proxy
 # Server-side
 <reply>
 <data nocheck="yes">
-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
-ETag: "21025-dc7-39462498"
-Accept-Ranges: bytes
-Content-Length: 6
-
+HTTP/1.1 200 OK swsclose\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT\r
+ETag: "21025-dc7-39462498"\r
+Accept-Ranges: bytes\r
+Content-Length: 6\r
+\r
 hello
 </data>
 </reply>

diff --git a/tests/data/test550 b/tests/data/test550
index e9605d6cd0570022a70c39dcf4aa179cffb55412..8fd99a7fd821a68d641cc1b0afeb4f4c33990213 100644 (file)
--- a/tests/data/test550
+++ b/tests/data/test550
@@ -12,14 +12,14 @@ CURLOPT_PROXY
 # Server-side
 <reply>
 <data nocheck="yes">
-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
-ETag: "21025-dc7-39462498"
-Accept-Ranges: bytes
-Content-Length: 6
-
+HTTP/1.1 200 OK swsclose\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT\r
+ETag: "21025-dc7-39462498"\r
+Accept-Ranges: bytes\r
+Content-Length: 6\r
+\r
 hello
 </data>
 </reply>

diff --git a/tests/data/test556 b/tests/data/test556
index 998bdfb076384ac3de9768f226be164c0c5998dd..55c7c91c3315ef0b7f51c151a2578851bf2739f5 100644 (file)
--- a/tests/data/test556
+++ b/tests/data/test556
@@ -8,12 +8,12 @@ HTTP GET
 
 <reply>
 <data>
-HTTP/1.1 200 OK
-Server: test-server/fake
-Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-Content-Length: 6
-Connection: close
-
+HTTP/1.1 200 OK\r
+Server: test-server/fake\r
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT\r
+Content-Length: 6\r
+Connection: close\r
+\r
 -foo-
 </data>
 </reply>

diff --git a/tests/data/test560 b/tests/data/test560
index 0e991b82576f64f44ed7534c71980bc499d30831..8d005541f2978d4eb9a7761b906c261abfa5aa6f 100644 (file)
--- a/tests/data/test560
+++ b/tests/data/test560
@@ -11,11 +11,11 @@ multi
 # Server-side
 <reply>
 <data>
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 7
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 7\r
+\r
 MooMoo
 </data>
 </reply>

diff --git a/tests/data/test561 b/tests/data/test561
index 8f069e6ed42db9f320fd1d7daf0041a08465f55a..9f437f58d372fb7eed3deaa34dbf98d020fe8602 100644 (file)
--- a/tests/data/test561
+++ b/tests/data/test561
@@ -13,14 +13,14 @@ type=
 # Server-side
 <reply>
 <data nocheck="yes">
-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
-ETag: "21025-dc7-39462498"
-Accept-Ranges: bytes
-Content-Length: 6
-
+HTTP/1.1 200 OK swsclose\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT\r
+ETag: "21025-dc7-39462498"\r
+Accept-Ranges: bytes\r
+Content-Length: 6\r
+\r
 hello
 </data>
 </reply>

diff --git a/tests/data/test567 b/tests/data/test567
index 4fd14843cdefd885bf97931c0b4ff1c125f8964f..de0f632731a1cc91e3f87c8f85027550a49bfafe 100644 (file)
--- a/tests/data/test567
+++ b/tests/data/test567
@@ -11,11 +11,11 @@ OPTIONS
 # Server-side
 <reply>
 <data>
-RTSP/1.0 200 OK
-Server: RTSPD/libcurl-test
-CSeq: 1
-Public: DESCRIBE, OPTIONS, SETUP, TEARDOWN, PLAY, PAUSE
-Curl-Private: swsclose
+RTSP/1.0 200 OK\r
+Server: RTSPD/libcurl-test\r
+CSeq: 1\r
+Public: DESCRIBE, OPTIONS, SETUP, TEARDOWN, PLAY, PAUSE\r
+Curl-Private: swsclose\r
 </data>
 </reply>
 

diff --git a/tests/data/test568 b/tests/data/test568
index 0f8440fbd33d9113cacbf101b36a2eb9d07da9cc..09fa81ce2f57726aed16a4a0091cfaa949870e3c 100644 (file)
--- a/tests/data/test568
+++ b/tests/data/test568
@@ -11,37 +11,37 @@ ANNOUNCE
 # Server-side
 <reply>
 <data1>
-RTSP/1.0 200 OK
-Server: RTSPD/libcurl-test
-Cseq: 1
-
+RTSP/1.0 200 OK\r
+Server: RTSPD/libcurl-test\r
+Cseq: 1\r
+\r
 </data1>
 
 <data2>
-RTSP/1.0 200 OK
-Server: RTSPD/libcurl-test
-Cseq: 2
-Content-Length: 70
-Content-Type: application/sdp
-
+RTSP/1.0 200 OK\r
+Server: RTSPD/libcurl-test\r
+Cseq: 2\r
+Content-Length: 70\r
+Content-Type: application/sdp\r
+\r
 v=0
 s=rtspd SDP
 i=A fake SDP reply
 u=http://www.curl.example.com/fakesdp.ps
 </data2>
 <data3>
-RTSP/1.0 200 Okie Dokie
-Server: RTSPD/libcurl-test
-Cseq: 3
-
+RTSP/1.0 200 Okie Dokie\r
+Server: RTSPD/libcurl-test\r
+Cseq: 3\r
+\r
 </data3>
 <data4>
-RTSP/1.0 200 OK
-Server: RTSPD/libcurl-test
-CSeq: 4
-Curl-private: swsclose
-Informational: Empty Options Response
-
+RTSP/1.0 200 OK\r
+Server: RTSPD/libcurl-test\r
+CSeq: 4\r
+Curl-private: swsclose\r
+Informational: Empty Options Response\r
+\r
 </data4>
 </reply>
 

diff --git a/tests/data/test570 b/tests/data/test570
index aec863846cbe30c9ed68d1cf2e0c48385365e303..65f32a5bed574f99a259177797cc469adf1180d4 100644 (file)
--- a/tests/data/test570
+++ b/tests/data/test570
@@ -11,28 +11,28 @@ Mismatch checking
 # Server-side
 <reply>
 <data1>
-RTSP/1.0 200 OK
-Server: RTSPD/libcurl-test
-CSeq: 2
-Public: DESCRIBE, OPTIONS, SETUP, TEARDOWN, PLAY, PAUSE
-Informational: CSeq Mismatch
-
+RTSP/1.0 200 OK\r
+Server: RTSPD/libcurl-test\r
+CSeq: 2\r
+Public: DESCRIBE, OPTIONS, SETUP, TEARDOWN, PLAY, PAUSE\r
+Informational: CSeq Mismatch\r
+\r
 </data1>
 <data2>
-RTSP/1.0 200 OK
-Server: RTSPD/libcurl-test
-Session: asdf
-CSeq: 999
-
+RTSP/1.0 200 OK\r
+Server: RTSPD/libcurl-test\r
+Session: asdf\r
+CSeq: 999\r
+\r
 </data2>
 <data3>
-RTSP/1.0 200 OK
-Server: RTSPD/libcurl-test
-Session: asdfWRONG
-Informational: Session ID mismatch
-Curl-Private: swsclose
-CSeq: 1000
-
+RTSP/1.0 200 OK\r
+Server: RTSPD/libcurl-test\r
+Session: asdfWRONG\r
+Informational: Session ID mismatch\r
+Curl-Private: swsclose\r
+CSeq: 1000\r
+\r
 </data3>
 
 </reply>

diff --git a/tests/data/test571 b/tests/data/test571
index f41ef01f2a9935802b93c5af6626a16ed76947f6..bedb5e9201811f0427a48c96b6b16212e308cadc 100644 (file)
--- a/tests/data/test571
+++ b/tests/data/test571
@@ -15,37 +15,37 @@ RTP
 # Server-side
 <reply>
 <data1>
-RTSP/1.0 200 OK
-Server: RTSPD/libcurl-test
-Session: asdf
-CSeq: 1
-
+RTSP/1.0 200 OK\r
+Server: RTSPD/libcurl-test\r
+Session: asdf\r
+CSeq: 1\r
+\r
 </data1>
 
 <data2>
-RTSP/1.0 200 OK
-Server: RTSPD/libcurl-test
-CSeq: 2
-Session: asdf
-
+RTSP/1.0 200 OK\r
+Server: RTSPD/libcurl-test\r
+CSeq: 2\r
+Session: asdf\r
+\r
 </data2>
 
 <data3>
-RTSP/1.0 200 OK
-Server: RTSPD/libcurl-test
-Cseq: 3
-Content-Length: 4
-Content-Type: fake/evil
-
+RTSP/1.0 200 OK\r
+Server: RTSPD/libcurl-test\r
+Cseq: 3\r
+Content-Length: 4\r
+Content-Type: fake/evil\r
+\r
 $99
 </data3>
 
 <data4>
-RTSP/1.0 200 OK
-Server: RTSPD/libcurl-test
-Session: asdf
-CSeq: 4
-
+RTSP/1.0 200 OK\r
+Server: RTSPD/libcurl-test\r
+Session: asdf\r
+CSeq: 4\r
+\r
 </data4>
 
 <servercmd>

diff --git a/tests/data/test572 b/tests/data/test572
index 83ae646e20b49a21a2f8fcac619266ec837b9089..903ded967a8d0e02055c412c390cd3aab54afa61 100644 (file)
--- a/tests/data/test572
+++ b/tests/data/test572
@@ -11,52 +11,52 @@ GET_PARAMETER
 # Server-side
 <reply>
 <data1>
-RTSP/1.0 200 OK
-Server: RTSPD/libcurl-test
-Session: getparams-test
-CSeq: 1
-
+RTSP/1.0 200 OK\r
+Server: RTSPD/libcurl-test\r
+Session: getparams-test\r
+CSeq: 1\r
+\r
 </data1>
 
 <data2>
-RTSP/1.0 200 OK
-Server: RTSPD/libcurl-test
-Session: getparams-test
-Content-Type: text/parameters
-Content-Length: 32
-Cseq: 2
-
+RTSP/1.0 200 OK\r
+Server: RTSPD/libcurl-test\r
+Session: getparams-test\r
+Content-Type: text/parameters\r
+Content-Length: 32\r
+Cseq: 2\r
+\r
 scale=enormous
 speed=ludicrous
 
 </data2>
 
 <data3>
-RTSP/1.0 204 OK
-Server: RTSPD/libcurl-test
-Session: getparams-test
-Cseq: 3
-
+RTSP/1.0 204 OK\r
+Server: RTSPD/libcurl-test\r
+Session: getparams-test\r
+Cseq: 3\r
+\r
 </data3>
 
 <data4>
-RTSP/1.0 200 Okie Dokie
-Server: RTSPD/libcurl-test
-Session: getparams-test
-Cseq: 4
-Content-Length: 37
-
+RTSP/1.0 200 Okie Dokie\r
+Server: RTSPD/libcurl-test\r
+Session: getparams-test\r
+Cseq: 4\r
+Content-Length: 37\r
+\r
 packets_received: 1000
 jitter: 0.314
 </data4>
 <data5>
-RTSP/1.0 200 OK
-Server: RTSPD/libcurl-test
-Session: getparams-test
-CSeq: 5
-Curl-private: swsclose
-Informational: Empty Options Response
-
+RTSP/1.0 200 OK\r
+Server: RTSPD/libcurl-test\r
+Session: getparams-test\r
+CSeq: 5\r
+Curl-private: swsclose\r
+Informational: Empty Options Response\r
+\r
 </data5>
 </reply>
 

diff --git a/tests/data/test573 b/tests/data/test573
index 54ff8fb94e563d5847c85a14d80a3057c7a54910..054064ffbcff845a6f34c5247cae235b5b1866ec 100644 (file)
--- a/tests/data/test573
+++ b/tests/data/test573
@@ -9,17 +9,17 @@ multi
 # Server-side
 <reply>
 <data>
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-ETag: "21025-dc7-39462498"
-Accept-Ranges: bytes
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Funny-head: yesyes
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT\r
+ETag: "21025-dc7-39462498"\r
+Accept-Ranges: bytes\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+Funny-head: yesyes\r
+\r
 -foo-
 </data>
 </reply>

diff --git a/tests/data/test579 b/tests/data/test579
index 5f87944376752a7e4861a2194898495e30118556..d21be1be1aef248ac6a409c90b5c2cdbdc607491 100644 (file)
--- a/tests/data/test579
+++ b/tests/data/test579
@@ -10,43 +10,43 @@ HTTP Digest auth
 # Server-side
 <reply>
 <data>
-HTTP/1.1 100 Continue
-Server: Microsoft-IIS/5.0
-Date: Sun, 03 Apr 2005 14:57:45 GMT
-X-Powered-By: ASP.NET
-
-HTTP/1.1 401 authentication please swsbounce
-Server: Microsoft-IIS/6.0
-WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
-Content-Type: text/html; charset=iso-8859-1
-Content-Length: 0
-
+HTTP/1.1 100 Continue\r
+Server: Microsoft-IIS/5.0\r
+Date: Sun, 03 Apr 2005 14:57:45 GMT\r
+X-Powered-By: ASP.NET\r
+\r
+HTTP/1.1 401 authentication please swsbounce\r
+Server: Microsoft-IIS/6.0\r
+WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"\r
+Content-Type: text/html; charset=iso-8859-1\r
+Content-Length: 0\r
+\r
 </data>
 <data1>
-HTTP/1.1 200 A OK
-Server: Microsoft-IIS/6.0
-Content-Type: text/html; charset=iso-8859-1
-Content-Length: 3
-
+HTTP/1.1 200 A OK\r
+Server: Microsoft-IIS/6.0\r
+Content-Type: text/html; charset=iso-8859-1\r
+Content-Length: 3\r
+\r
 ok
 </data1>
 <datacheck>
-HTTP/1.1 100 Continue
-Server: Microsoft-IIS/5.0
-Date: Sun, 03 Apr 2005 14:57:45 GMT
-X-Powered-By: ASP.NET
-
-HTTP/1.1 401 authentication please swsbounce
-Server: Microsoft-IIS/6.0
-WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
-Content-Type: text/html; charset=iso-8859-1
-Content-Length: 0
-
-HTTP/1.1 200 A OK
-Server: Microsoft-IIS/6.0
-Content-Type: text/html; charset=iso-8859-1
-Content-Length: 3
-
+HTTP/1.1 100 Continue\r
+Server: Microsoft-IIS/5.0\r
+Date: Sun, 03 Apr 2005 14:57:45 GMT\r
+X-Powered-By: ASP.NET\r
+\r
+HTTP/1.1 401 authentication please swsbounce\r
+Server: Microsoft-IIS/6.0\r
+WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"\r
+Content-Type: text/html; charset=iso-8859-1\r
+Content-Length: 0\r
+\r
+HTTP/1.1 200 A OK\r
+Server: Microsoft-IIS/6.0\r
+Content-Type: text/html; charset=iso-8859-1\r
+Content-Length: 3\r
+\r
 ok
 </datacheck>
 </reply>

diff --git a/tests/data/test580 b/tests/data/test580
index 8256f0e2e793c1cbf769227a8f703ad58f6c2aed..13965598f475d10c0b3a2ed9b167331be039f523 100644 (file)
--- a/tests/data/test580
+++ b/tests/data/test580
@@ -11,14 +11,14 @@ Duplicate-header
 # Server-side
 <reply>
 <data>
-HTTP/1.1 302 eat this!
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Location: this-is-the-first.html
-Content-Length: 0
-Connection: close
-Location: and there's a second one too! / moo.html
-
+HTTP/1.1 302 eat this!\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Location: this-is-the-first.html\r
+Content-Length: 0\r
+Connection: close\r
+Location: and there's a second one too! / moo.html\r
+\r
 </data>
 </reply>
 

diff --git a/tests/data/test581 b/tests/data/test581
index acaa41b9faeb61325368cc8c49ef4d5c46eae6aa..83d7b604ecd96626995a0c63883b48734b0edb32 100644 (file)
--- a/tests/data/test581
+++ b/tests/data/test581
@@ -11,14 +11,14 @@ Duplicate-header
 # Server-side
 <reply>
 <data>
-HTTP/1.1 200 all good!
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Type: text/html
-Content-Length: 0
-Connection: close
-Content-Type: changed/my/mind
-
+HTTP/1.1 200 all good!\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Type: text/html\r
+Content-Length: 0\r
+Connection: close\r
+Content-Type: changed/my/mind\r
+\r
 </data>
 </reply>
 

diff --git a/tests/data/test585 b/tests/data/test585
index 32cb06fec018b4bd551078a4749cf88a217a289a..2096e81c32db4a04de399b8da6bd2b7daeffd9e9 100644 (file)
--- a/tests/data/test585
+++ b/tests/data/test585
@@ -12,23 +12,23 @@ CURLOPT_CLOSESOCKETFUNCTION
 # Server-side
 <reply>
 <data>
-HTTP/1.1 302 eat this!
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Location: this-is-the-first.html
-Content-Length: 0
-Connection: close
-
+HTTP/1.1 302 eat this!\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Location: this-is-the-first.html\r
+Content-Length: 0\r
+Connection: close\r
+\r
 </data>
 <datacheck>
 [OPEN] counter: 1
-HTTP/1.1 302 eat this!
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Location: this-is-the-first.html
-Content-Length: 0
-Connection: close
-
+HTTP/1.1 302 eat this!\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Location: this-is-the-first.html\r
+Content-Length: 0\r
+Connection: close\r
+\r
 [CLOSE] counter: 1
 </datacheck>
 </reply>

diff --git a/tests/data/test599 b/tests/data/test599
index 82151372eabbb34f9d0ac660430304754046c369..c57fe5c919fc0f39f2cf5d0fef44641bab39bd2f 100644 (file)
--- a/tests/data/test599
+++ b/tests/data/test599
@@ -9,24 +9,24 @@ HTTP POST
 # Server-side
 <reply>
 <data>
-HTTP/1.1 302 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Location: 5990001
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-
+HTTP/1.1 302 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Location: 5990001\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+\r
 -foo-
 </data>
 <data1>
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Transfer-Encoding: chunked
-Connection: close
-Content-Type: text/html
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Transfer-Encoding: chunked\r
+Connection: close\r
+Content-Type: text/html\r
+\r
 32\r
 this data is slightly larger than the first piece
 \r
@@ -35,21 +35,21 @@ this data is slightly larger than the first piece
 </data1>
 
 <datacheck>
-HTTP/1.1 302 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Location: 5990001
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Transfer-Encoding: chunked
-Connection: close
-Content-Type: text/html
-
+HTTP/1.1 302 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Location: 5990001\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+\r
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Transfer-Encoding: chunked\r
+Connection: close\r
+Content-Type: text/html\r
+\r
 this data is slightly larger than the first piece
 </datacheck>