HTTP tests: use CRLF as header seperator according to RFC 2616
Updates the test suite to handle binary-mode header output.
This commit is contained in:
@@ -55,11 +55,11 @@ Accept: */*
|
|||||||
|
|
||||||
</protocol>
|
</protocol>
|
||||||
|
|
||||||
<file1 name="log/1334" mode="text">
|
<file1 name="log/1334">
|
||||||
12345
|
12345
|
||||||
</file1>
|
</file1>
|
||||||
|
|
||||||
<file2 name="log/heads1334" mode="text">
|
<file2 name="log/heads1334">
|
||||||
HTTP/1.1 200 OK
|
HTTP/1.1 200 OK
|
||||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||||
Server: test-server/fake
|
Server: test-server/fake
|
||||||
@@ -69,7 +69,7 @@ Content-Type: text/html
|
|||||||
|
|
||||||
</file2>
|
</file2>
|
||||||
|
|
||||||
<file3 name="log/stdout1334" mode="text">
|
<file3 name="log/stdout1334">
|
||||||
</file3>
|
</file3>
|
||||||
|
|
||||||
</verify>
|
</verify>
|
||||||
|
|||||||
@@ -59,11 +59,11 @@ Accept: */*
|
|||||||
|
|
||||||
</protocol>
|
</protocol>
|
||||||
|
|
||||||
<file1 name="log/1336" mode="text">
|
<file1 name="log/1336">
|
||||||
12345
|
12345
|
||||||
</file1>
|
</file1>
|
||||||
|
|
||||||
<file2 name="log/heads1336" mode="text">
|
<file2 name="log/heads1336">
|
||||||
HTTP/1.1 200 OK
|
HTTP/1.1 200 OK
|
||||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||||
Server: test-server/fake
|
Server: test-server/fake
|
||||||
@@ -74,7 +74,7 @@ Content-Disposition: filename=name1336; charset=funny; option=strange
|
|||||||
|
|
||||||
</file2>
|
</file2>
|
||||||
|
|
||||||
<file3 name="log/stdout1336" mode="text">
|
<file3 name="log/stdout1336">
|
||||||
</file3>
|
</file3>
|
||||||
|
|
||||||
</verify>
|
</verify>
|
||||||
|
|||||||
@@ -56,11 +56,11 @@ Accept: */*
|
|||||||
|
|
||||||
</protocol>
|
</protocol>
|
||||||
|
|
||||||
<file1 name="log/1338" mode="text">
|
<file1 name="log/1338">
|
||||||
12345
|
12345
|
||||||
</file1>
|
</file1>
|
||||||
|
|
||||||
<file2 name="log/heads1338" mode="text">
|
<file2 name="log/heads1338">
|
||||||
HTTP/1.1 200 OK
|
HTTP/1.1 200 OK
|
||||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||||
Server: test-server/fake
|
Server: test-server/fake
|
||||||
@@ -70,7 +70,7 @@ Content-Type: text/html
|
|||||||
|
|
||||||
</file2>
|
</file2>
|
||||||
|
|
||||||
<file3 name="log/stdout1338" mode="text">
|
<file3 name="log/stdout1338">
|
||||||
</file3>
|
</file3>
|
||||||
|
|
||||||
</verify>
|
</verify>
|
||||||
|
|||||||
@@ -57,11 +57,11 @@ Accept: */*
|
|||||||
|
|
||||||
</protocol>
|
</protocol>
|
||||||
|
|
||||||
<file1 name="log/name1340" mode="text">
|
<file1 name="log/name1340">
|
||||||
12345
|
12345
|
||||||
</file1>
|
</file1>
|
||||||
|
|
||||||
<file2 name="log/heads1340" mode="text">
|
<file2 name="log/heads1340">
|
||||||
HTTP/1.1 200 OK
|
HTTP/1.1 200 OK
|
||||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||||
Server: test-server/fake
|
Server: test-server/fake
|
||||||
@@ -72,7 +72,7 @@ Content-Disposition: filename=name1340; charset=funny; option=strange
|
|||||||
|
|
||||||
</file2>
|
</file2>
|
||||||
|
|
||||||
<file3 name="log/stdout1340" mode="text">
|
<file3 name="log/stdout1340">
|
||||||
curl: Saved to filename '%PWD/log/name1340'
|
curl: Saved to filename '%PWD/log/name1340'
|
||||||
</file3>
|
</file3>
|
||||||
|
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ Accept: */*
|
|||||||
|
|
||||||
</protocol>
|
</protocol>
|
||||||
|
|
||||||
<file1 name="log/1342" mode="text">
|
<file1 name="log/1342">
|
||||||
HTTP/1.1 200 OK
|
HTTP/1.1 200 OK
|
||||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||||
Server: test-server/fake
|
Server: test-server/fake
|
||||||
@@ -66,7 +66,7 @@ Content-Type: text/html
|
|||||||
12345
|
12345
|
||||||
</file1>
|
</file1>
|
||||||
|
|
||||||
<file2 name="log/heads1342" mode="text">
|
<file2 name="log/heads1342">
|
||||||
HTTP/1.1 200 OK
|
HTTP/1.1 200 OK
|
||||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||||
Server: test-server/fake
|
Server: test-server/fake
|
||||||
@@ -76,7 +76,7 @@ Content-Type: text/html
|
|||||||
|
|
||||||
</file2>
|
</file2>
|
||||||
|
|
||||||
<file3 name="log/stdout1342" mode="text">
|
<file3 name="log/stdout1342">
|
||||||
</file3>
|
</file3>
|
||||||
|
|
||||||
</verify>
|
</verify>
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ Accept: */*
|
|||||||
|
|
||||||
</protocol>
|
</protocol>
|
||||||
|
|
||||||
<file1 name="log/1344" mode="text">
|
<file1 name="log/1344">
|
||||||
HTTP/1.1 200 OK
|
HTTP/1.1 200 OK
|
||||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||||
Server: test-server/fake
|
Server: test-server/fake
|
||||||
@@ -71,7 +71,7 @@ Content-Disposition: filename=name1344; charset=funny; option=strange
|
|||||||
12345
|
12345
|
||||||
</file1>
|
</file1>
|
||||||
|
|
||||||
<file2 name="log/heads1344" mode="text">
|
<file2 name="log/heads1344">
|
||||||
HTTP/1.1 200 OK
|
HTTP/1.1 200 OK
|
||||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||||
Server: test-server/fake
|
Server: test-server/fake
|
||||||
@@ -82,7 +82,7 @@ Content-Disposition: filename=name1344; charset=funny; option=strange
|
|||||||
|
|
||||||
</file2>
|
</file2>
|
||||||
|
|
||||||
<file3 name="log/stdout1344" mode="text">
|
<file3 name="log/stdout1344">
|
||||||
</file3>
|
</file3>
|
||||||
|
|
||||||
</verify>
|
</verify>
|
||||||
|
|||||||
@@ -50,11 +50,11 @@ Accept: */*
|
|||||||
|
|
||||||
</protocol>
|
</protocol>
|
||||||
|
|
||||||
<file1 name="log/outfile1364" mode="text">
|
<file1 name="log/outfile1364">
|
||||||
12345
|
12345
|
||||||
</file1>
|
</file1>
|
||||||
|
|
||||||
<file2 name="log/heads1364" mode="text">
|
<file2 name="log/heads1364">
|
||||||
HTTP/1.1 200 OK
|
HTTP/1.1 200 OK
|
||||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||||
Server: test-server/fake
|
Server: test-server/fake
|
||||||
@@ -64,7 +64,7 @@ Content-Type: text/html
|
|||||||
|
|
||||||
</file2>
|
</file2>
|
||||||
|
|
||||||
<file3 name="log/stdout1364" mode="text">
|
<file3 name="log/stdout1364">
|
||||||
</file3>
|
</file3>
|
||||||
|
|
||||||
</verify>
|
</verify>
|
||||||
|
|||||||
@@ -51,11 +51,11 @@ Accept: */*
|
|||||||
|
|
||||||
</protocol>
|
</protocol>
|
||||||
|
|
||||||
<file1 name="log/outfile1366" mode="text">
|
<file1 name="log/outfile1366">
|
||||||
12345
|
12345
|
||||||
</file1>
|
</file1>
|
||||||
|
|
||||||
<file2 name="log/heads1366" mode="text">
|
<file2 name="log/heads1366">
|
||||||
HTTP/1.1 200 OK
|
HTTP/1.1 200 OK
|
||||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||||
Server: test-server/fake
|
Server: test-server/fake
|
||||||
@@ -66,7 +66,7 @@ Content-Disposition: filename=name1366; charset=funny; option=strange
|
|||||||
|
|
||||||
</file2>
|
</file2>
|
||||||
|
|
||||||
<file3 name="log/stdout1366" mode="text">
|
<file3 name="log/stdout1366">
|
||||||
</file3>
|
</file3>
|
||||||
|
|
||||||
</verify>
|
</verify>
|
||||||
|
|||||||
@@ -51,11 +51,11 @@ Accept: */*
|
|||||||
|
|
||||||
</protocol>
|
</protocol>
|
||||||
|
|
||||||
<file1 name="log/outfile1368" mode="text">
|
<file1 name="log/outfile1368">
|
||||||
12345
|
12345
|
||||||
</file1>
|
</file1>
|
||||||
|
|
||||||
<file2 name="log/heads1368" mode="text">
|
<file2 name="log/heads1368">
|
||||||
HTTP/1.1 200 OK
|
HTTP/1.1 200 OK
|
||||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||||
Server: test-server/fake
|
Server: test-server/fake
|
||||||
@@ -65,7 +65,7 @@ Content-Type: text/html
|
|||||||
|
|
||||||
</file2>
|
</file2>
|
||||||
|
|
||||||
<file3 name="log/stdout1368" mode="text">
|
<file3 name="log/stdout1368">
|
||||||
</file3>
|
</file3>
|
||||||
|
|
||||||
</verify>
|
</verify>
|
||||||
|
|||||||
@@ -52,11 +52,11 @@ Accept: */*
|
|||||||
|
|
||||||
</protocol>
|
</protocol>
|
||||||
|
|
||||||
<file1 name="log/outfile1370" mode="text">
|
<file1 name="log/outfile1370">
|
||||||
12345
|
12345
|
||||||
</file1>
|
</file1>
|
||||||
|
|
||||||
<file2 name="log/heads1370" mode="text">
|
<file2 name="log/heads1370">
|
||||||
HTTP/1.1 200 OK
|
HTTP/1.1 200 OK
|
||||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||||
Server: test-server/fake
|
Server: test-server/fake
|
||||||
@@ -67,7 +67,7 @@ Content-Disposition: filename=name1370; charset=funny; option=strange
|
|||||||
|
|
||||||
</file2>
|
</file2>
|
||||||
|
|
||||||
<file3 name="log/stdout1370" mode="text">
|
<file3 name="log/stdout1370">
|
||||||
</file3>
|
</file3>
|
||||||
|
|
||||||
</verify>
|
</verify>
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ Accept: */*
|
|||||||
|
|
||||||
</protocol>
|
</protocol>
|
||||||
|
|
||||||
<file1 name="log/outfile1372" mode="text">
|
<file1 name="log/outfile1372">
|
||||||
HTTP/1.1 200 OK
|
HTTP/1.1 200 OK
|
||||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||||
Server: test-server/fake
|
Server: test-server/fake
|
||||||
@@ -61,7 +61,7 @@ Content-Type: text/html
|
|||||||
12345
|
12345
|
||||||
</file1>
|
</file1>
|
||||||
|
|
||||||
<file2 name="log/heads1372" mode="text">
|
<file2 name="log/heads1372">
|
||||||
HTTP/1.1 200 OK
|
HTTP/1.1 200 OK
|
||||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||||
Server: test-server/fake
|
Server: test-server/fake
|
||||||
@@ -71,7 +71,7 @@ Content-Type: text/html
|
|||||||
|
|
||||||
</file2>
|
</file2>
|
||||||
|
|
||||||
<file3 name="log/stdout1372" mode="text">
|
<file3 name="log/stdout1372">
|
||||||
</file3>
|
</file3>
|
||||||
|
|
||||||
</verify>
|
</verify>
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ Accept: */*
|
|||||||
|
|
||||||
</protocol>
|
</protocol>
|
||||||
|
|
||||||
<file1 name="log/outfile1374" mode="text">
|
<file1 name="log/outfile1374">
|
||||||
HTTP/1.1 200 OK
|
HTTP/1.1 200 OK
|
||||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||||
Server: test-server/fake
|
Server: test-server/fake
|
||||||
@@ -63,7 +63,7 @@ Content-Disposition: filename=name1374; charset=funny; option=strange
|
|||||||
12345
|
12345
|
||||||
</file1>
|
</file1>
|
||||||
|
|
||||||
<file2 name="log/heads1374" mode="text">
|
<file2 name="log/heads1374">
|
||||||
HTTP/1.1 200 OK
|
HTTP/1.1 200 OK
|
||||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||||
Server: test-server/fake
|
Server: test-server/fake
|
||||||
@@ -74,7 +74,7 @@ Content-Disposition: filename=name1374; charset=funny; option=strange
|
|||||||
|
|
||||||
</file2>
|
</file2>
|
||||||
|
|
||||||
<file3 name="log/stdout1374" mode="text">
|
<file3 name="log/stdout1374">
|
||||||
</file3>
|
</file3>
|
||||||
|
|
||||||
</verify>
|
</verify>
|
||||||
|
|||||||
@@ -76,8 +76,8 @@ MOOOO
|
|||||||
250 CWD command successful.
|
250 CWD command successful.
|
||||||
229 Entering Passive Mode (stripped)
|
229 Entering Passive Mode (stripped)
|
||||||
200 I modify TYPE as you wanted
|
200 I modify TYPE as you wanted
|
||||||
213 214
|
213 222
|
||||||
150 Binary data connection for 1387 () (214 bytes).
|
150 Binary data connection for 1387 () (222 bytes).
|
||||||
226 File transfer complete
|
226 File transfer complete
|
||||||
</file2>
|
</file2>
|
||||||
<stripfile2>
|
<stripfile2>
|
||||||
|
|||||||
@@ -77,8 +77,8 @@ MOOOO
|
|||||||
250 CWD command successful.
|
250 CWD command successful.
|
||||||
229 Entering Passive Mode (stripped)
|
229 Entering Passive Mode (stripped)
|
||||||
200 I modify TYPE as you wanted
|
200 I modify TYPE as you wanted
|
||||||
213 214
|
213 222
|
||||||
150 Binary data connection for 1389 () (214 bytes).
|
150 Binary data connection for 1389 () (222 bytes).
|
||||||
226 File transfer complete
|
226 File transfer complete
|
||||||
</file2>
|
</file2>
|
||||||
<stripfile2>
|
<stripfile2>
|
||||||
|
|||||||
@@ -76,8 +76,8 @@ MOOOO
|
|||||||
250 CWD command successful.
|
250 CWD command successful.
|
||||||
229 Entering Passive Mode (stripped)
|
229 Entering Passive Mode (stripped)
|
||||||
200 I modify TYPE as you wanted
|
200 I modify TYPE as you wanted
|
||||||
213 214
|
213 222
|
||||||
150 Binary data connection for 1391 () (214 bytes).
|
150 Binary data connection for 1391 () (222 bytes).
|
||||||
226 File transfer complete
|
226 File transfer complete
|
||||||
</file2>
|
</file2>
|
||||||
<stripfile2>
|
<stripfile2>
|
||||||
|
|||||||
Reference in New Issue
Block a user