HTTP tests: use CRLF as header seperator according to RFC 2616

Updates the test suite to handle binary-mode header output.

diff --git a/tests/data/test1334 b/tests/data/test1334
index 93c939fd526fba42893617afdd40bb1172edee35..59116e38822ad205d41f38dc0d18aad11b31040a 100644 (file)
--- a/tests/data/test1334
+++ b/tests/data/test1334
@@ -9,13 +9,13 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-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
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+\r
 12345
 </data>
 </reply>
@@ -55,21 +55,21 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/1334" mode="text">
+<file1 name="log/1334">
 12345
 </file1>
 
-<file2 name="log/heads1334" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-
+<file2 name="log/heads1334">
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+\r
 </file2>
 
-<file3 name="log/stdout1334" mode="text">
+<file3 name="log/stdout1334">
 </file3>
 
 </verify>

diff --git a/tests/data/test1336 b/tests/data/test1336
index 9e8aca3684e679bc89e9d85baf79aa86ea30479c..ebe562b6a5a6c4c72d1709f1344f0c0da06d8328 100644 (file)
--- a/tests/data/test1336
+++ b/tests/data/test1336
@@ -9,14 +9,14 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1336; charset=funny; option=strange
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+Content-Disposition: filename=name1336; charset=funny; option=strange\r
+\r
 12345
 </data>
 </reply>
@@ -59,22 +59,22 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/1336" mode="text">
+<file1 name="log/1336">
 12345
 </file1>
 
-<file2 name="log/heads1336" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1336; charset=funny; option=strange
-
+<file2 name="log/heads1336">
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+Content-Disposition: filename=name1336; charset=funny; option=strange\r
+\r
 </file2>
 
-<file3 name="log/stdout1336" mode="text">
+<file3 name="log/stdout1336">
 </file3>
 
 </verify>

diff --git a/tests/data/test1338 b/tests/data/test1338
index 8a1b3955a62178a91aec34d05a15013d02ee7607..d96f80467b02c4097e8908ddd0f7a17ff7fd9af2 100644 (file)
--- a/tests/data/test1338
+++ b/tests/data/test1338
@@ -10,13 +10,13 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-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
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+\r
 12345
 </data>
 </reply>
@@ -56,21 +56,21 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/1338" mode="text">
+<file1 name="log/1338">
 12345
 </file1>
 
-<file2 name="log/heads1338" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-
+<file2 name="log/heads1338">
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+\r
 </file2>
 
-<file3 name="log/stdout1338" mode="text">
+<file3 name="log/stdout1338">
 </file3>
 
 </verify>

diff --git a/tests/data/test1340 b/tests/data/test1340
index ad26bba5be4b2fe0664ee563a98f40727343979e..a1ca73f7949d3c13accbf957b8e88cae6e2ca280 100644 (file)
--- a/tests/data/test1340
+++ b/tests/data/test1340
@@ -10,14 +10,14 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1340; charset=funny; option=strange
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+Content-Disposition: filename=name1340; charset=funny; option=strange\r
+\r
 12345
 </data>
 </reply>
@@ -57,22 +57,22 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/name1340" mode="text">
+<file1 name="log/name1340">
 12345
 </file1>
 
-<file2 name="log/heads1340" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1340; charset=funny; option=strange
-
+<file2 name="log/heads1340">
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+Content-Disposition: filename=name1340; charset=funny; option=strange\r
+\r
 </file2>
 
-<file3 name="log/stdout1340" mode="text">
+<file3 name="log/stdout1340">
 curl: Saved to filename '%PWD/log/name1340'
 </file3>
 

diff --git a/tests/data/test1342 b/tests/data/test1342
index 7820663bf8550e046e87727bf13a5ccedba0151c..1d7889d1ebfeba9c8a2ad1e195c85473d06ac709 100644 (file)
--- a/tests/data/test1342
+++ b/tests/data/test1342
@@ -9,13 +9,13 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-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
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+\r
 12345
 </data>
 </reply>
@@ -55,28 +55,28 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/1342" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-
+<file1 name="log/1342">
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+\r
 12345
 </file1>
 
-<file2 name="log/heads1342" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-
+<file2 name="log/heads1342">
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+\r
 </file2>
 
-<file3 name="log/stdout1342" mode="text">
+<file3 name="log/stdout1342">
 </file3>
 
 </verify>

diff --git a/tests/data/test1344 b/tests/data/test1344
index 145305d30a4f84977ebd93002ef6ac9eb23fd803..ac354f0dd417ef9934c8532c6f0ad60d369aec72 100644 (file)
--- a/tests/data/test1344
+++ b/tests/data/test1344
@@ -9,14 +9,14 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1344; charset=funny; option=strange
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+Content-Disposition: filename=name1344; charset=funny; option=strange\r
+\r
 12345
 </data>
 </reply>
@@ -59,30 +59,30 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/1344" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1344; charset=funny; option=strange
-
+<file1 name="log/1344">
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+Content-Disposition: filename=name1344; charset=funny; option=strange\r
+\r
 12345
 </file1>
 
-<file2 name="log/heads1344" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1344; charset=funny; option=strange
-
+<file2 name="log/heads1344">
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+Content-Disposition: filename=name1344; charset=funny; option=strange\r
+\r
 </file2>
 
-<file3 name="log/stdout1344" mode="text">
+<file3 name="log/stdout1344">
 </file3>
 
 </verify>

diff --git a/tests/data/test1364 b/tests/data/test1364
index f4f48ff67b7d4efab6dee5d2a518edb25ce19483..e8c981d779a9fad80a6256046810461ffe86a121 100644 (file)
--- a/tests/data/test1364
+++ b/tests/data/test1364
@@ -9,13 +9,13 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-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
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+\r
 12345
 </data>
 </reply>
@@ -50,21 +50,21 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/outfile1364" mode="text">
+<file1 name="log/outfile1364">
 12345
 </file1>
 
-<file2 name="log/heads1364" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-
+<file2 name="log/heads1364">
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+\r
 </file2>
 
-<file3 name="log/stdout1364" mode="text">
+<file3 name="log/stdout1364">
 </file3>
 
 </verify>

diff --git a/tests/data/test1366 b/tests/data/test1366
index 2a7d0598ac73212dc3ae6c5e26e57e0ee7a78348..62e3b0c42f4b12c8c79ad866a8093d6c3fde4989 100644 (file)
--- a/tests/data/test1366
+++ b/tests/data/test1366
@@ -9,14 +9,14 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1366; charset=funny; option=strange
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+Content-Disposition: filename=name1366; charset=funny; option=strange\r
+\r
 12345
 </data>
 </reply>
@@ -51,22 +51,22 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/outfile1366" mode="text">
+<file1 name="log/outfile1366">
 12345
 </file1>
 
-<file2 name="log/heads1366" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1366; charset=funny; option=strange
-
+<file2 name="log/heads1366">
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+Content-Disposition: filename=name1366; charset=funny; option=strange\r
+\r
 </file2>
 
-<file3 name="log/stdout1366" mode="text">
+<file3 name="log/stdout1366">
 </file3>
 
 </verify>

diff --git a/tests/data/test1368 b/tests/data/test1368
index 9dc9a5e165df5201f9a163957b1a87d61cd33632..6a926ab68fcab20219a627d5cf99d604cea0a757 100644 (file)
--- a/tests/data/test1368
+++ b/tests/data/test1368
@@ -10,13 +10,13 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-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
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+\r
 12345
 </data>
 </reply>
@@ -51,21 +51,21 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/outfile1368" mode="text">
+<file1 name="log/outfile1368">
 12345
 </file1>
 
-<file2 name="log/heads1368" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-
+<file2 name="log/heads1368">
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+\r
 </file2>
 
-<file3 name="log/stdout1368" mode="text">
+<file3 name="log/stdout1368">
 </file3>
 
 </verify>

diff --git a/tests/data/test1370 b/tests/data/test1370
index 26b4b151b2b4e22ed3b1e3b29ac57730e1c4476b..d0abbdd68989136fda24f2e5dc5acab093fb00a1 100644 (file)
--- a/tests/data/test1370
+++ b/tests/data/test1370
@@ -10,14 +10,14 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1370; charset=funny; option=strange
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+Content-Disposition: filename=name1370; charset=funny; option=strange\r
+\r
 12345
 </data>
 </reply>
@@ -52,22 +52,22 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/outfile1370" mode="text">
+<file1 name="log/outfile1370">
 12345
 </file1>
 
-<file2 name="log/heads1370" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1370; charset=funny; option=strange
-
+<file2 name="log/heads1370">
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+Content-Disposition: filename=name1370; charset=funny; option=strange\r
+\r
 </file2>
 
-<file3 name="log/stdout1370" mode="text">
+<file3 name="log/stdout1370">
 </file3>
 
 </verify>

diff --git a/tests/data/test1372 b/tests/data/test1372
index 9c617f8a5328f13b638a8c173ffd082b7f05b008..a2b8ec9619ca2d3701584318bfd0d8a450135d78 100644 (file)
--- a/tests/data/test1372
+++ b/tests/data/test1372
@@ -9,13 +9,13 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-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
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+\r
 12345
 </data>
 </reply>
@@ -50,28 +50,28 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/outfile1372" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-
+<file1 name="log/outfile1372">
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+\r
 12345
 </file1>
 
-<file2 name="log/heads1372" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-
+<file2 name="log/heads1372">
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+\r
 </file2>
 
-<file3 name="log/stdout1372" mode="text">
+<file3 name="log/stdout1372">
 </file3>
 
 </verify>

diff --git a/tests/data/test1374 b/tests/data/test1374
index aef2b7d08b329c0e5f553fae222ae714fbd36a63..f8d9d0dd051883bd4d4a449710659efd3aa83b63 100644 (file)
--- a/tests/data/test1374
+++ b/tests/data/test1374
@@ -9,14 +9,14 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1374; charset=funny; option=strange
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+Content-Disposition: filename=name1374; charset=funny; option=strange\r
+\r
 12345
 </data>
 </reply>
@@ -51,30 +51,30 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/outfile1374" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1374; charset=funny; option=strange
-
+<file1 name="log/outfile1374">
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+Content-Disposition: filename=name1374; charset=funny; option=strange\r
+\r
 12345
 </file1>
 
-<file2 name="log/heads1374" mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1374; charset=funny; option=strange
-
+<file2 name="log/heads1374">
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+Content-Disposition: filename=name1374; charset=funny; option=strange\r
+\r
 </file2>
 
-<file3 name="log/stdout1374" mode="text">
+<file3 name="log/stdout1374">
 </file3>
 
 </verify>

diff --git a/tests/data/test1387 b/tests/data/test1387
index 85ea948d3d0a58eda1cfd33d01246fe1c0c774b1..2b6c3fcb9112f34def9d1caa3ce4020042ce9c2b 100644 (file)
--- a/tests/data/test1387
+++ b/tests/data/test1387
@@ -10,14 +10,14 @@ RETR
 <reply>
 # file1387 contents...
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1387; charset=funny; option=strange
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+Content-Disposition: filename=name1387; charset=funny; option=strange\r
+\r
 MOOOO
 </data>
 </reply>
@@ -53,14 +53,14 @@ QUIT
 </protocol>
 
 <file1 name="log/download1387">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1387; charset=funny; option=strange
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+Content-Disposition: filename=name1387; charset=funny; option=strange\r
+\r
 MOOOO
 </file1>
 
@@ -76,8 +76,8 @@ MOOOO
 250 CWD command successful.\r
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted\r
-213 214\r
-150 Binary data connection for 1387 () (214 bytes).\r
+213 222\r
+150 Binary data connection for 1387 () (222 bytes).\r
 226 File transfer complete\r
 </file2>
 <stripfile2>

diff --git a/tests/data/test1389 b/tests/data/test1389
index 2357e314cfef25c44b4720150cf470f18f938407..4aaacd82b3a4c1a9a82f8b812a6f69129ee44a36 100644 (file)
--- a/tests/data/test1389
+++ b/tests/data/test1389
@@ -11,14 +11,14 @@ RETR
 <reply>
 # file1389 contents...
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1389; charset=funny; option=strange
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+Content-Disposition: filename=name1389; charset=funny; option=strange\r
+\r
 MOOOO
 </data>
 </reply>
@@ -54,14 +54,14 @@ QUIT
 </protocol>
 
 <file1 name="log/download1389">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1389; charset=funny; option=strange
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+Content-Disposition: filename=name1389; charset=funny; option=strange\r
+\r
 MOOOO
 </file1>
 
@@ -77,8 +77,8 @@ MOOOO
 250 CWD command successful.\r
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted\r
-213 214\r
-150 Binary data connection for 1389 () (214 bytes).\r
+213 222\r
+150 Binary data connection for 1389 () (222 bytes).\r
 226 File transfer complete\r
 </file2>
 <stripfile2>

diff --git a/tests/data/test1391 b/tests/data/test1391
index 911bb5f51f23a603201676ec2d8fc90fa16d8488..09c670a94568ef84aa29a78c50898c9d4ddf6734 100644 (file)
--- a/tests/data/test1391
+++ b/tests/data/test1391
@@ -10,14 +10,14 @@ RETR
 <reply>
 # file1391 contents...
 <data nocheck="yes">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1391; charset=funny; option=strange
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+Content-Disposition: filename=name1391; charset=funny; option=strange\r
+\r
 MOOOO
 </data>
 </reply>
@@ -53,14 +53,14 @@ QUIT
 </protocol>
 
 <file1 name="log/download1391">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Content-Disposition: filename=name1391; charset=funny; option=strange
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+Content-Disposition: filename=name1391; charset=funny; option=strange\r
+\r
 MOOOO
 </file1>
 
@@ -76,8 +76,8 @@ MOOOO
 250 CWD command successful.\r
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted\r
-213 214\r
-150 Binary data connection for 1391 () (214 bytes).\r
+213 222\r
+150 Binary data connection for 1391 () (222 bytes).\r
 226 File transfer complete\r
 </file2>
 <stripfile2>