From 0a568867c0ee0eec283ce282f707e7a1338dcc44 Mon Sep 17 00:00:00 2001 From: Marc Hoersken Date: Sat, 1 Feb 2014 14:03:55 +0100 Subject: HTTP tests: use CRLF as header seperator according to RFC 2616 Updates the test suite to handle binary-mode header output. --- tests/data/test1334 | 34 ++++++++++++++++----------------- tests/data/test1336 | 38 ++++++++++++++++++------------------- tests/data/test1338 | 34 ++++++++++++++++----------------- tests/data/test1340 | 38 ++++++++++++++++++------------------- tests/data/test1342 | 48 +++++++++++++++++++++++------------------------ tests/data/test1344 | 54 ++++++++++++++++++++++++++--------------------------- tests/data/test1364 | 34 ++++++++++++++++----------------- tests/data/test1366 | 38 ++++++++++++++++++------------------- tests/data/test1368 | 34 ++++++++++++++++----------------- tests/data/test1370 | 38 ++++++++++++++++++------------------- tests/data/test1372 | 48 +++++++++++++++++++++++------------------------ tests/data/test1374 | 54 ++++++++++++++++++++++++++--------------------------- tests/data/test1387 | 36 +++++++++++++++++------------------ tests/data/test1389 | 36 +++++++++++++++++------------------ tests/data/test1391 | 36 +++++++++++++++++------------------ 15 files changed, 300 insertions(+), 300 deletions(-) (limited to 'tests') diff --git a/tests/data/test1334 b/tests/data/test1334 index 93c939fd5..59116e388 100644 --- a/tests/data/test1334 +++ b/tests/data/test1334 @@ -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,21 +55,21 @@ 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/test1336 b/tests/data/test1336 index 9e8aca368..ebe562b6a 100644 --- a/tests/data/test1336 +++ b/tests/data/test1336 @@ -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=name1336; 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=name1336; charset=funny; option=strange + 12345 @@ -59,22 +59,22 @@ 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=name1336; 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=name1336; charset=funny; option=strange + - + diff --git a/tests/data/test1338 b/tests/data/test1338 index 8a1b3955a..d96f80467 100644 --- a/tests/data/test1338 +++ b/tests/data/test1338 @@ -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,21 +56,21 @@ 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/test1340 b/tests/data/test1340 index ad26bba5b..a1ca73f79 100644 --- a/tests/data/test1340 +++ b/tests/data/test1340 @@ -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=name1340; 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=name1340; charset=funny; option=strange + 12345 @@ -57,22 +57,22 @@ 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=name1340; 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=name1340; charset=funny; option=strange + - + curl: Saved to filename '%PWD/log/name1340' diff --git a/tests/data/test1342 b/tests/data/test1342 index 7820663bf..1d7889d1e 100644 --- a/tests/data/test1342 +++ b/tests/data/test1342 @@ -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,28 +55,28 @@ 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/test1344 b/tests/data/test1344 index 145305d30..ac354f0dd 100644 --- a/tests/data/test1344 +++ b/tests/data/test1344 @@ -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=name1344; 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=name1344; charset=funny; option=strange + 12345 @@ -59,30 +59,30 @@ 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=name1344; 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=name1344; 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=name1344; 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=name1344; charset=funny; option=strange + - + diff --git a/tests/data/test1364 b/tests/data/test1364 index f4f48ff67..e8c981d77 100644 --- a/tests/data/test1364 +++ b/tests/data/test1364 @@ -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,21 +50,21 @@ 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/test1366 b/tests/data/test1366 index 2a7d0598a..62e3b0c42 100644 --- a/tests/data/test1366 +++ b/tests/data/test1366 @@ -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=name1366; 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=name1366; charset=funny; option=strange + 12345 @@ -51,22 +51,22 @@ 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=name1366; 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=name1366; charset=funny; option=strange + - + diff --git a/tests/data/test1368 b/tests/data/test1368 index 9dc9a5e16..6a926ab68 100644 --- a/tests/data/test1368 +++ b/tests/data/test1368 @@ -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,21 +51,21 @@ 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/test1370 b/tests/data/test1370 index 26b4b151b..d0abbdd68 100644 --- a/tests/data/test1370 +++ b/tests/data/test1370 @@ -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=name1370; 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=name1370; charset=funny; option=strange + 12345 @@ -52,22 +52,22 @@ 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=name1370; 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=name1370; charset=funny; option=strange + - + diff --git a/tests/data/test1372 b/tests/data/test1372 index 9c617f8a5..a2b8ec961 100644 --- a/tests/data/test1372 +++ b/tests/data/test1372 @@ -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,28 +50,28 @@ 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/test1374 b/tests/data/test1374 index aef2b7d08..f8d9d0dd0 100644 --- a/tests/data/test1374 +++ b/tests/data/test1374 @@ -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=name1374; 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=name1374; charset=funny; option=strange + 12345 @@ -51,30 +51,30 @@ 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=name1374; 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=name1374; 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=name1374; 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=name1374; charset=funny; option=strange + - + diff --git a/tests/data/test1387 b/tests/data/test1387 index 85ea948d3..2b6c3fcb9 100644 --- a/tests/data/test1387 +++ b/tests/data/test1387 @@ -10,14 +10,14 @@ RETR # file1387 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=name1387; 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=name1387; 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=name1387; 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=name1387; 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 1387 () (214 bytes). +213 222 +150 Binary data connection for 1387 () (222 bytes). 226 File transfer complete diff --git a/tests/data/test1389 b/tests/data/test1389 index 2357e314c..4aaacd82b 100644 --- a/tests/data/test1389 +++ b/tests/data/test1389 @@ -11,14 +11,14 @@ RETR # file1389 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=name1389; 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=name1389; 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=name1389; 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=name1389; 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 1389 () (214 bytes). +213 222 +150 Binary data connection for 1389 () (222 bytes). 226 File transfer complete diff --git a/tests/data/test1391 b/tests/data/test1391 index 911bb5f51..09c670a94 100644 --- a/tests/data/test1391 +++ b/tests/data/test1391 @@ -10,14 +10,14 @@ RETR # file1391 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=name1391; 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=name1391; 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=name1391; 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=name1391; 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 1391 () (214 bytes). +213 222 +150 Binary data connection for 1391 () (222 bytes). 226 File transfer complete -- cgit v1.2.3