From: Marc Hoersken Date: Sat, 1 Feb 2014 12:58:41 +0000 (+0100) Subject: HTTP tests: use CRLF as header seperator according to RFC 2616 X-Git-Tag: curl-7_36_0~153 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=89c29aa70f8dc07d73d7b6f01c0121dc3c335495;p=thirdparty%2Fcurl.git HTTP tests: use CRLF as header seperator according to RFC 2616 Changes LF to CRLF and disables automatic output conversion. --- diff --git a/tests/data/test1335 b/tests/data/test1335 index 3f43c7a573..bb499e73f3 100644 --- a/tests/data/test1335 +++ b/tests/data/test1335 @@ -9,13 +9,13 @@ HTTP GET # -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 +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 6 +Connection: close +Content-Type: text/html + 12345 @@ -55,18 +55,18 @@ Accept: */* - + 12345 - -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 +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 6 +Connection: close +Content-Type: text/html + diff --git a/tests/data/test1337 b/tests/data/test1337 index 4044190e50..80a99facfe 100644 --- a/tests/data/test1337 +++ b/tests/data/test1337 @@ -9,14 +9,14 @@ HTTP GET # -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=name1337; charset=funny; option=strange - +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=name1337; charset=funny; option=strange + 12345 @@ -59,19 +59,19 @@ Accept: */* - + 12345 - -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=name1337; charset=funny; option=strange - + +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=name1337; charset=funny; option=strange + diff --git a/tests/data/test1339 b/tests/data/test1339 index 06106ad4b9..a3c1f0e54a 100644 --- a/tests/data/test1339 +++ b/tests/data/test1339 @@ -10,13 +10,13 @@ HTTP GET # -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 +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 6 +Connection: close +Content-Type: text/html + 12345 @@ -56,18 +56,18 @@ Accept: */* - + 12345 - -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 +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 6 +Connection: close +Content-Type: text/html + diff --git a/tests/data/test1341 b/tests/data/test1341 index 013a8884fd..b364edeb14 100644 --- a/tests/data/test1341 +++ b/tests/data/test1341 @@ -10,14 +10,14 @@ HTTP GET # -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=name1341; charset=funny; option=strange - +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=name1341; charset=funny; option=strange + 12345 @@ -57,19 +57,19 @@ Accept: */* - + 12345 - -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=name1341; charset=funny; option=strange - + +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=name1341; charset=funny; option=strange + curl: Saved to filename '%PWD/log/name1341' diff --git a/tests/data/test1343 b/tests/data/test1343 index 904a3791cc..a05cab04cd 100644 --- a/tests/data/test1343 +++ b/tests/data/test1343 @@ -9,13 +9,13 @@ HTTP GET # -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 +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 6 +Connection: close +Content-Type: text/html + 12345 @@ -55,25 +55,25 @@ Accept: */* - -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 +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 6 +Connection: close +Content-Type: text/html + 12345 - -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 +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 6 +Connection: close +Content-Type: text/html + diff --git a/tests/data/test1345 b/tests/data/test1345 index 7d53728099..6d1201e161 100644 --- a/tests/data/test1345 +++ b/tests/data/test1345 @@ -9,14 +9,14 @@ HTTP GET # -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=name1345; charset=funny; option=strange - +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=name1345; charset=funny; option=strange + 12345 @@ -59,27 +59,27 @@ Accept: */* - -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=name1345; charset=funny; option=strange - + +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=name1345; charset=funny; option=strange + 12345 - -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=name1345; charset=funny; option=strange - + +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=name1345; charset=funny; option=strange + diff --git a/tests/data/test1346 b/tests/data/test1346 index eda9a2c294..347214e697 100644 --- a/tests/data/test1346 +++ b/tests/data/test1346 @@ -9,13 +9,13 @@ HTTP GET # -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 +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 6 +Connection: close +Content-Type: text/html + 12345 @@ -55,18 +55,18 @@ Accept: */* - -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 +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 6 +Connection: close +Content-Type: text/html + 12345 - + diff --git a/tests/data/test1347 b/tests/data/test1347 index b2218467b5..8eac42cb2b 100644 --- a/tests/data/test1347 +++ b/tests/data/test1347 @@ -9,14 +9,14 @@ HTTP GET # -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=name1347; charset=funny; option=strange - +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=name1347; charset=funny; option=strange + 12345 @@ -59,19 +59,19 @@ Accept: */* - -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=name1347; charset=funny; option=strange - + +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=name1347; charset=funny; option=strange + 12345 - + diff --git a/tests/data/test1356 b/tests/data/test1356 index adc7346408..ea610a565d 100644 --- a/tests/data/test1356 +++ b/tests/data/test1356 @@ -10,14 +10,14 @@ RETR # file1356 contents... -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=name1356; charset=funny; option=strange - +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=name1356; charset=funny; option=strange + MOOOO @@ -60,19 +60,19 @@ RETR file1356 QUIT - -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=name1356; charset=funny; option=strange - + +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=name1356; charset=funny; option=strange + MOOOO - + diff --git a/tests/data/test1363 b/tests/data/test1363 index fedc6fcc71..c34f05a0ec 100644 --- a/tests/data/test1363 +++ b/tests/data/test1363 @@ -10,14 +10,14 @@ RETR # file1363 contents... -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=name1363; charset=funny; option=strange - +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=name1363; charset=funny; option=strange + MOOOO @@ -60,19 +60,19 @@ RETR file1363 QUIT - -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=name1363; charset=funny; option=strange - + +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=name1363; charset=funny; option=strange + MOOOO - + diff --git a/tests/data/test1365 b/tests/data/test1365 index f5e95e8ebc..4a09cfd6ab 100644 --- a/tests/data/test1365 +++ b/tests/data/test1365 @@ -9,13 +9,13 @@ HTTP GET # -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 +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 6 +Connection: close +Content-Type: text/html + 12345 @@ -50,18 +50,18 @@ Accept: */* - + 12345 - -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 +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 6 +Connection: close +Content-Type: text/html + diff --git a/tests/data/test1367 b/tests/data/test1367 index 6b576b73fe..d4bd3d777b 100644 --- a/tests/data/test1367 +++ b/tests/data/test1367 @@ -9,14 +9,14 @@ HTTP GET # -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=name1367; charset=funny; option=strange - +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=name1367; charset=funny; option=strange + 12345 @@ -51,19 +51,19 @@ Accept: */* - + 12345 - -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=name1367; charset=funny; option=strange - + +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=name1367; charset=funny; option=strange + diff --git a/tests/data/test1369 b/tests/data/test1369 index a24665a88e..5176ed0b03 100644 --- a/tests/data/test1369 +++ b/tests/data/test1369 @@ -10,13 +10,13 @@ HTTP GET # -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 +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 6 +Connection: close +Content-Type: text/html + 12345 @@ -51,18 +51,18 @@ Accept: */* - + 12345 - -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 +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 6 +Connection: close +Content-Type: text/html + diff --git a/tests/data/test1371 b/tests/data/test1371 index 31a64a31ef..fe3977fae6 100644 --- a/tests/data/test1371 +++ b/tests/data/test1371 @@ -10,14 +10,14 @@ HTTP GET # -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=name1371; charset=funny; option=strange - +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=name1371; charset=funny; option=strange + 12345 @@ -52,19 +52,19 @@ Accept: */* - + 12345 - -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=name1371; charset=funny; option=strange - + +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=name1371; charset=funny; option=strange + diff --git a/tests/data/test1373 b/tests/data/test1373 index 2f6e3bdb4b..ae906d7bd9 100644 --- a/tests/data/test1373 +++ b/tests/data/test1373 @@ -9,13 +9,13 @@ HTTP GET # -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 +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 6 +Connection: close +Content-Type: text/html + 12345 @@ -50,25 +50,25 @@ Accept: */* - -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 +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 6 +Connection: close +Content-Type: text/html + 12345 - -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 +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 6 +Connection: close +Content-Type: text/html + diff --git a/tests/data/test1375 b/tests/data/test1375 index 717b645fb0..595f03ac13 100644 --- a/tests/data/test1375 +++ b/tests/data/test1375 @@ -9,14 +9,14 @@ HTTP GET # -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=name1375; charset=funny; option=strange - +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=name1375; charset=funny; option=strange + 12345 @@ -51,27 +51,27 @@ Accept: */* - -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=name1375; charset=funny; option=strange - + +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=name1375; charset=funny; option=strange + 12345 - -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=name1375; charset=funny; option=strange - + +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=name1375; charset=funny; option=strange + diff --git a/tests/data/test1376 b/tests/data/test1376 index 02068db0dd..f34c277450 100644 --- a/tests/data/test1376 +++ b/tests/data/test1376 @@ -9,13 +9,13 @@ HTTP GET # -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 +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 6 +Connection: close +Content-Type: text/html + 12345 @@ -50,18 +50,18 @@ Accept: */* - -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 +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 6 +Connection: close +Content-Type: text/html + 12345 - + diff --git a/tests/data/test1377 b/tests/data/test1377 index fede100c96..f542b11c77 100644 --- a/tests/data/test1377 +++ b/tests/data/test1377 @@ -9,14 +9,14 @@ HTTP GET # -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=name1377; charset=funny; option=strange - +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=name1377; charset=funny; option=strange + 12345 @@ -51,19 +51,19 @@ Accept: */* - -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=name1377; charset=funny; option=strange - + +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=name1377; charset=funny; option=strange + 12345 - + diff --git a/tests/data/test1386 b/tests/data/test1386 index da47d5b85f..c7f5d8ae91 100644 --- a/tests/data/test1386 +++ b/tests/data/test1386 @@ -10,14 +10,14 @@ RETR # file1386 contents... -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=name1386; charset=funny; option=strange - +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=name1386; charset=funny; option=strange + MOOOO @@ -52,19 +52,19 @@ RETR file1386 QUIT - -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=name1386; charset=funny; option=strange - + +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=name1386; charset=funny; option=strange + MOOOO - + diff --git a/tests/data/test1388 b/tests/data/test1388 index 5f5cc0cffe..3d2c59a2ea 100644 --- a/tests/data/test1388 +++ b/tests/data/test1388 @@ -10,14 +10,14 @@ RETR # file1388 contents... -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=name1388; charset=funny; option=strange - +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=name1388; charset=funny; option=strange + MOOOO @@ -53,14 +53,14 @@ QUIT -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=name1388; charset=funny; option=strange - +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=name1388; charset=funny; option=strange + MOOOO @@ -76,8 +76,8 @@ MOOOO 250 CWD command successful. 229 Entering Passive Mode (stripped) 200 I modify TYPE as you wanted -213 214 -150 Binary data connection for 1388 () (214 bytes). +213 222 +150 Binary data connection for 1388 () (222 bytes). 226 File transfer complete diff --git a/tests/data/test1390 b/tests/data/test1390 index 53eac5b951..0668cf7b09 100644 --- a/tests/data/test1390 +++ b/tests/data/test1390 @@ -11,14 +11,14 @@ RETR # file1390 contents... -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=name1390; charset=funny; option=strange - +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=name1390; charset=funny; option=strange + MOOOO @@ -54,14 +54,14 @@ QUIT -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=name1390; charset=funny; option=strange - +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=name1390; charset=funny; option=strange + MOOOO @@ -77,8 +77,8 @@ MOOOO 250 CWD command successful. 229 Entering Passive Mode (stripped) 200 I modify TYPE as you wanted -213 214 -150 Binary data connection for 1390 () (214 bytes). +213 222 +150 Binary data connection for 1390 () (222 bytes). 226 File transfer complete diff --git a/tests/data/test1392 b/tests/data/test1392 index 4c8f0b190b..994c881d5d 100644 --- a/tests/data/test1392 +++ b/tests/data/test1392 @@ -10,14 +10,14 @@ RETR # file1392 contents... -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=name1392; charset=funny; option=strange - +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=name1392; charset=funny; option=strange + MOOOO @@ -53,14 +53,14 @@ QUIT -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=name1392; charset=funny; option=strange - +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=name1392; charset=funny; option=strange + MOOOO @@ -76,8 +76,8 @@ MOOOO 250 CWD command successful. 229 Entering Passive Mode (stripped) 200 I modify TYPE as you wanted -213 214 -150 Binary data connection for 1392 () (214 bytes). +213 222 +150 Binary data connection for 1392 () (222 bytes). 226 File transfer complete diff --git a/tests/data/test1393 b/tests/data/test1393 index ebb8151d82..12f928476f 100644 --- a/tests/data/test1393 +++ b/tests/data/test1393 @@ -10,14 +10,14 @@ RETR # file1393 contents... -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=name1393; charset=funny; option=strange - +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=name1393; charset=funny; option=strange + MOOOO @@ -52,19 +52,19 @@ RETR file1393 QUIT - -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=name1393; charset=funny; option=strange - + +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=name1393; charset=funny; option=strange + MOOOO - +