Do not mix CRLF and LF header endings in a couple of HTTP tests
Consistently use CRLF instead. The mixed endings weren't documented so I assume they were unintentional. This change doesn't matter for curl itself but makes using the tests with a proxy between curl and the test server more convenient. Tests that consistently use no carriage returns were left unmodified as one can easily work around this.
This commit is contained in:
Родитель
409f2a041f
Коммит
ab0fa55780
|
@ -17,11 +17,11 @@ Content-Length: 0
|
|||
|
||||
</data>
|
||||
<data2>
|
||||
HTTP/1.1 200 OK swsclose
|
||||
Location: this should be ignored
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Connection: close
|
||||
|
||||
HTTP/1.1 200 OK swsclose
|
||||
Location: this should be ignored
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Connection: close
|
||||
|
||||
body
|
||||
</data2>
|
||||
<datacheck>
|
||||
|
@ -30,11 +30,11 @@ Location: moo.html&testcase=/10110002
|
|||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Content-Length: 0
|
||||
|
||||
HTTP/1.1 200 OK swsclose
|
||||
Location: this should be ignored
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Connection: close
|
||||
|
||||
HTTP/1.1 200 OK swsclose
|
||||
Location: this should be ignored
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Connection: close
|
||||
|
||||
body
|
||||
</datacheck>
|
||||
</reply>
|
||||
|
|
|
@ -17,11 +17,11 @@ Connection: close
|
|||
|
||||
</data>
|
||||
<data2>
|
||||
HTTP/1.1 200 OK swsclose
|
||||
Location: this should be ignored
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Connection: close
|
||||
|
||||
HTTP/1.1 200 OK swsclose
|
||||
Location: this should be ignored
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Connection: close
|
||||
|
||||
body
|
||||
</data2>
|
||||
<datacheck>
|
||||
|
@ -30,11 +30,11 @@ Location: moo.html&testcase=/10120002
|
|||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Connection: close
|
||||
|
||||
HTTP/1.1 200 OK swsclose
|
||||
Location: this should be ignored
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Connection: close
|
||||
|
||||
HTTP/1.1 200 OK swsclose
|
||||
Location: this should be ignored
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Connection: close
|
||||
|
||||
body
|
||||
</datacheck>
|
||||
</reply>
|
||||
|
|
|
@ -8,10 +8,10 @@ HTTP custom request
|
|||
# Server-side
|
||||
<reply>
|
||||
<data>
|
||||
HTTP/1.1 200 Read you
|
||||
HTTP/1.1 200 Read you
|
||||
Content-Length: 29
|
||||
Deleted: suppose we got a header like this! ;-)
|
||||
|
||||
Deleted: suppose we got a header like this! ;-)
|
||||
|
||||
blabla custom request result
|
||||
</data>
|
||||
</reply>
|
||||
|
|
|
@ -19,11 +19,11 @@ Connection: close
|
|||
|
||||
</data>
|
||||
<data2>
|
||||
HTTP/1.1 200 OK swsclose
|
||||
Location: this should be ignored
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Connection: close
|
||||
|
||||
HTTP/1.1 200 OK swsclose
|
||||
Location: this should be ignored
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Connection: close
|
||||
|
||||
body
|
||||
</data2>
|
||||
<datacheck>
|
||||
|
@ -32,11 +32,11 @@ Location: 13250002
|
|||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Connection: close
|
||||
|
||||
HTTP/1.1 200 OK swsclose
|
||||
Location: this should be ignored
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Connection: close
|
||||
|
||||
HTTP/1.1 200 OK swsclose
|
||||
Location: this should be ignored
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Connection: close
|
||||
|
||||
body
|
||||
</datacheck>
|
||||
</reply>
|
||||
|
|
|
@ -17,11 +17,11 @@ Connection: close
|
|||
|
||||
</data>
|
||||
<data2>
|
||||
HTTP/1.1 200 OK swsclose
|
||||
Location: this should be ignored
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Connection: close
|
||||
|
||||
HTTP/1.1 200 OK swsclose
|
||||
Location: this should be ignored
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Connection: close
|
||||
|
||||
body
|
||||
</data2>
|
||||
<datacheck>
|
||||
|
@ -30,11 +30,11 @@ Location: moo.html/14130002#fragmentpart
|
|||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Connection: close
|
||||
|
||||
HTTP/1.1 200 OK swsclose
|
||||
Location: this should be ignored
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Connection: close
|
||||
|
||||
HTTP/1.1 200 OK swsclose
|
||||
Location: this should be ignored
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Connection: close
|
||||
|
||||
body
|
||||
</datacheck>
|
||||
</reply>
|
||||
|
|
|
@ -6,7 +6,7 @@ HTTP/1.1 200 beng swsclose
|
|||
Server: Microsoft-IIS/6.0
|
||||
Authentication-Info: Passport1.4 tname=MSPAuth,tname=MSPProf,tname=MSPConsent,tname=MSPSecAuth
|
||||
Content-Type: text/html; charset=iso-8859-1
|
||||
Content-Length: 26
|
||||
Content-Length: 26
|
||||
|
||||
This is not the real page
|
||||
</data>
|
||||
|
|
|
@ -22,7 +22,7 @@ This is not the real page
|
|||
HTTP/1.1 200 moo swsclose
|
||||
Server: Microsoft-IIS/6.0
|
||||
Content-Type: text/html; charset=iso-8859-1
|
||||
Content-Length: 16
|
||||
Content-Length: 16
|
||||
|
||||
content for you
|
||||
</data1>
|
||||
|
@ -36,7 +36,7 @@ Content-Type: text/html; charset=iso-8859-1
|
|||
HTTP/1.1 200 moo swsclose
|
||||
Server: Microsoft-IIS/6.0
|
||||
Content-Type: text/html; charset=iso-8859-1
|
||||
Content-Length: 16
|
||||
Content-Length: 16
|
||||
|
||||
content for you
|
||||
</datacheck>
|
||||
|
|
|
@ -15,7 +15,7 @@ Content-Type: text/html; charset=iso-8859-1
|
|||
HTTP/1.1 200 moo swsclose
|
||||
Server: Microsoft-IIS/6.0
|
||||
Content-Type: text/html; charset=iso-8859-1
|
||||
Content-Length: 16
|
||||
Content-Length: 16
|
||||
|
||||
content for you
|
||||
</data>
|
||||
|
@ -29,7 +29,7 @@ Content-Type: text/html; charset=iso-8859-1
|
|||
HTTP/1.1 200 moo swsclose
|
||||
Server: Microsoft-IIS/6.0
|
||||
Content-Type: text/html; charset=iso-8859-1
|
||||
Content-Length: 16
|
||||
Content-Length: 16
|
||||
|
||||
content for you
|
||||
</datacheck>
|
||||
|
|
|
@ -9,24 +9,24 @@ HTTP GET
|
|||
# Server-side
|
||||
<reply>
|
||||
<data nocheck="yes">
|
||||
HTTP/1.1 200 OK
|
||||
Funny-head: yesyes
|
||||
HTTP/1.1 200 OK
|
||||
Funny-head: yesyes
|
||||
Content-Length: 4
|
||||
|
||||
|
||||
moo
|
||||
</data>
|
||||
<data2>
|
||||
HTTP/1.1 200 OK
|
||||
Funny-head: yesyes
|
||||
HTTP/1.1 200 OK
|
||||
Funny-head: yesyes
|
||||
Content-Length: 4
|
||||
|
||||
|
||||
foo
|
||||
</data2>
|
||||
<data3>
|
||||
HTTP/1.1 200 OK
|
||||
Funny-head: yesyes
|
||||
HTTP/1.1 200 OK
|
||||
Funny-head: yesyes
|
||||
Content-Length: 4
|
||||
|
||||
|
||||
hoo
|
||||
</data3>
|
||||
</reply>
|
||||
|
@ -68,22 +68,22 @@ Accept: */*
|
|||
</protocol>
|
||||
<stdout>
|
||||
--_curl_--%HOSTIP:%HTTPPORT/18
|
||||
HTTP/1.1 200 OK
|
||||
Funny-head: yesyes
|
||||
HTTP/1.1 200 OK
|
||||
Funny-head: yesyes
|
||||
Content-Length: 4
|
||||
|
||||
|
||||
moo
|
||||
--_curl_--%HOSTIP:%HTTPPORT/180002
|
||||
HTTP/1.1 200 OK
|
||||
Funny-head: yesyes
|
||||
HTTP/1.1 200 OK
|
||||
Funny-head: yesyes
|
||||
Content-Length: 4
|
||||
|
||||
|
||||
foo
|
||||
--_curl_--%HOSTIP:%HTTPPORT/180003
|
||||
HTTP/1.1 200 OK
|
||||
Funny-head: yesyes
|
||||
HTTP/1.1 200 OK
|
||||
Funny-head: yesyes
|
||||
Content-Length: 4
|
||||
|
||||
|
||||
hoo
|
||||
</stdout>
|
||||
</verify>
|
||||
|
|
|
@ -9,10 +9,10 @@ long URL
|
|||
# Server-side
|
||||
<reply>
|
||||
<data>
|
||||
HTTP/1.1 200 OK
|
||||
Funny-head: yesyes
|
||||
HTTP/1.1 200 OK
|
||||
Funny-head: yesyes
|
||||
Content-Length: 27
|
||||
|
||||
|
||||
This is the proof it works
|
||||
</data>
|
||||
</reply>
|
||||
|
|
|
@ -12,7 +12,7 @@ HTTP Digest auth
|
|||
HTTP/1.1 401 Authorization Required swsclose
|
||||
Server: Apache/1.3.27 (Darwin) PHP/4.1.2
|
||||
WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
|
||||
WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
|
||||
WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
|
||||
Content-Type: text/html; charset=iso-8859-1
|
||||
|
||||
This is not the real page
|
||||
|
@ -33,7 +33,7 @@ This IS the real page!
|
|||
HTTP/1.1 401 Authorization Required swsclose
|
||||
Server: Apache/1.3.27 (Darwin) PHP/4.1.2
|
||||
WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
|
||||
WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
|
||||
WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
|
||||
Content-Type: text/html; charset=iso-8859-1
|
||||
|
||||
HTTP/1.1 200 OK swsclose
|
||||
|
|
|
@ -8,11 +8,11 @@ HTTP FORMPOST
|
|||
# Server-side
|
||||
<reply>
|
||||
<data>
|
||||
HTTP/1.1 200 OK
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Server: test-server/fake
|
||||
HTTP/1.1 200 OK
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Server: test-server/fake
|
||||
Content-Length: 10
|
||||
|
||||
|
||||
blablabla
|
||||
</data>
|
||||
</reply>
|
||||
|
|
|
@ -17,11 +17,11 @@ Connection: close
|
|||
|
||||
</data>
|
||||
<data2>
|
||||
HTTP/1.1 200 OK swsclose
|
||||
Location: this should be ignored
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Connection: close
|
||||
|
||||
HTTP/1.1 200 OK swsclose
|
||||
Location: this should be ignored
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Connection: close
|
||||
|
||||
body
|
||||
</data2>
|
||||
<datacheck>
|
||||
|
@ -30,11 +30,11 @@ Location: ../moo.html/?name=d a niel&testcase=/400002
|
|||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Connection: close
|
||||
|
||||
HTTP/1.1 200 OK swsclose
|
||||
Location: this should be ignored
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Connection: close
|
||||
|
||||
HTTP/1.1 200 OK swsclose
|
||||
Location: this should be ignored
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Connection: close
|
||||
|
||||
body
|
||||
</datacheck>
|
||||
</reply>
|
||||
|
|
|
@ -17,11 +17,11 @@ Connection: close
|
|||
|
||||
</data>
|
||||
<data2>
|
||||
HTTP/1.1 200 OK swsclose
|
||||
Location: this should be ignored
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Connection: close
|
||||
|
||||
HTTP/1.1 200 OK swsclose
|
||||
Location: this should be ignored
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Connection: close
|
||||
|
||||
body
|
||||
</data2>
|
||||
<datacheck>
|
||||
|
@ -30,11 +30,11 @@ Location: ../m o o.html/420002
|
|||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Connection: close
|
||||
|
||||
HTTP/1.1 200 OK swsclose
|
||||
Location: this should be ignored
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Connection: close
|
||||
|
||||
HTTP/1.1 200 OK swsclose
|
||||
Location: this should be ignored
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Connection: close
|
||||
|
||||
body
|
||||
</datacheck>
|
||||
</reply>
|
||||
|
|
Различия файлов скрыты, потому что одна или несколько строк слишком длинны
|
@ -9,13 +9,13 @@ cookies
|
|||
# Server-side
|
||||
<reply>
|
||||
<data>
|
||||
HTTP/1.1 200 OK
|
||||
Server: Microsoft-IIS/4.0
|
||||
Date: Tue, 25 Sep 2001 19:37:44 GMT
|
||||
Content-Type: text/html
|
||||
Connection: close
|
||||
HTTP/1.1 200 OK
|
||||
Server: Microsoft-IIS/4.0
|
||||
Date: Tue, 25 Sep 2001 19:37:44 GMT
|
||||
Content-Type: text/html
|
||||
Connection: close
|
||||
Content-Length: 21
|
||||
|
||||
|
||||
This server says moo
|
||||
</data>
|
||||
</reply>
|
||||
|
|
Загрузка…
Ссылка в новой задаче