Unity-Technologies
/
curl
зеркало из https://github.com/Unity-Technologies/curl.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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:
Fabian Keil 2012-11-14 19:49:12 +01:00 коммит произвёл Daniel Stenberg
Родитель 409f2a041f
Коммит ab0fa55780
16 изменённых файлов: 112 добавлений и 112 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

20
tests/data/test1011
Просмотреть файл

@ -17,11 +17,11 @@ Content-Length: 0
</data> </data>
<data2> <data2>
HTTP/1.1 200 OK swsclose HTTP/1.1 200 OK swsclose
Location: this should be ignored Location: this should be ignored
Date: Thu, 09 Nov 2010 14:49:00 GMT Date: Thu, 09 Nov 2010 14:49:00 GMT
Connection: close Connection: close
body body
</data2> </data2>
<datacheck> <datacheck>
@ -30,11 +30,11 @@ Location: moo.html&testcase=/10110002
Date: Thu, 09 Nov 2010 14:49:00 GMT Date: Thu, 09 Nov 2010 14:49:00 GMT
Content-Length: 0 Content-Length: 0
HTTP/1.1 200 OK swsclose HTTP/1.1 200 OK swsclose
Location: this should be ignored Location: this should be ignored
Date: Thu, 09 Nov 2010 14:49:00 GMT Date: Thu, 09 Nov 2010 14:49:00 GMT
Connection: close Connection: close
body body
</datacheck> </datacheck>
</reply> </reply>

20
tests/data/test1012
Просмотреть файл

@ -17,11 +17,11 @@ Connection: close
</data> </data>
<data2> <data2>
HTTP/1.1 200 OK swsclose HTTP/1.1 200 OK swsclose
Location: this should be ignored Location: this should be ignored
Date: Thu, 09 Nov 2010 14:49:00 GMT Date: Thu, 09 Nov 2010 14:49:00 GMT
Connection: close Connection: close
body body
</data2> </data2>
<datacheck> <datacheck>
@ -30,11 +30,11 @@ Location: moo.html&testcase=/10120002
Date: Thu, 09 Nov 2010 14:49:00 GMT Date: Thu, 09 Nov 2010 14:49:00 GMT
Connection: close Connection: close
HTTP/1.1 200 OK swsclose HTTP/1.1 200 OK swsclose
Location: this should be ignored Location: this should be ignored
Date: Thu, 09 Nov 2010 14:49:00 GMT Date: Thu, 09 Nov 2010 14:49:00 GMT
Connection: close Connection: close
body body
</datacheck> </datacheck>
</reply> </reply>

6
tests/data/test13
Просмотреть файл

@ -8,10 +8,10 @@ HTTP custom request
# Server-side # Server-side
<reply> <reply>
<data> <data>
HTTP/1.1 200 Read you HTTP/1.1 200 Read you
Content-Length: 29 Content-Length: 29
Deleted: suppose we got a header like this! ;-) Deleted: suppose we got a header like this! ;-)
blabla custom request result blabla custom request result
</data> </data>
</reply> </reply>

20
tests/data/test1325
Просмотреть файл

@ -19,11 +19,11 @@ Connection: close
</data> </data>
<data2> <data2>
HTTP/1.1 200 OK swsclose HTTP/1.1 200 OK swsclose
Location: this should be ignored Location: this should be ignored
Date: Thu, 09 Nov 2010 14:49:00 GMT Date: Thu, 09 Nov 2010 14:49:00 GMT
Connection: close Connection: close
body body
</data2> </data2>
<datacheck> <datacheck>
@ -32,11 +32,11 @@ Location: 13250002
Date: Thu, 09 Nov 2010 14:49:00 GMT Date: Thu, 09 Nov 2010 14:49:00 GMT
Connection: close Connection: close
HTTP/1.1 200 OK swsclose HTTP/1.1 200 OK swsclose
Location: this should be ignored Location: this should be ignored
Date: Thu, 09 Nov 2010 14:49:00 GMT Date: Thu, 09 Nov 2010 14:49:00 GMT
Connection: close Connection: close
body body
</datacheck> </datacheck>
</reply> </reply>

20
tests/data/test1413
Просмотреть файл

@ -17,11 +17,11 @@ Connection: close
</data> </data>
<data2> <data2>
HTTP/1.1 200 OK swsclose HTTP/1.1 200 OK swsclose
Location: this should be ignored Location: this should be ignored
Date: Thu, 09 Nov 2010 14:49:00 GMT Date: Thu, 09 Nov 2010 14:49:00 GMT
Connection: close Connection: close
body body
</data2> </data2>
<datacheck> <datacheck>
@ -30,11 +30,11 @@ Location: moo.html/14130002#fragmentpart
Date: Thu, 09 Nov 2010 14:49:00 GMT Date: Thu, 09 Nov 2010 14:49:00 GMT
Connection: close Connection: close
HTTP/1.1 200 OK swsclose HTTP/1.1 200 OK swsclose
Location: this should be ignored Location: this should be ignored
Date: Thu, 09 Nov 2010 14:49:00 GMT Date: Thu, 09 Nov 2010 14:49:00 GMT
Connection: close Connection: close
body body
</datacheck> </datacheck>
</reply> </reply>

2
tests/data/test174
Просмотреть файл

@ -6,7 +6,7 @@ HTTP/1.1 200 beng swsclose
Server: Microsoft-IIS/6.0 Server: Microsoft-IIS/6.0
Authentication-Info: Passport1.4 tname=MSPAuth,tname=MSPProf,tname=MSPConsent,tname=MSPSecAuth Authentication-Info: Passport1.4 tname=MSPAuth,tname=MSPProf,tname=MSPConsent,tname=MSPSecAuth
Content-Type: text/html; charset=iso-8859-1 Content-Type: text/html; charset=iso-8859-1
Content-Length: 26 Content-Length: 26
This is not the real page This is not the real page
</data> </data>

4
tests/data/test175
Просмотреть файл

@ -22,7 +22,7 @@ This is not the real page
HTTP/1.1 200 moo swsclose HTTP/1.1 200 moo swsclose
Server: Microsoft-IIS/6.0 Server: Microsoft-IIS/6.0
Content-Type: text/html; charset=iso-8859-1 Content-Type: text/html; charset=iso-8859-1
Content-Length: 16 Content-Length: 16
content for you content for you
</data1> </data1>
@ -36,7 +36,7 @@ Content-Type: text/html; charset=iso-8859-1
HTTP/1.1 200 moo swsclose HTTP/1.1 200 moo swsclose
Server: Microsoft-IIS/6.0 Server: Microsoft-IIS/6.0
Content-Type: text/html; charset=iso-8859-1 Content-Type: text/html; charset=iso-8859-1
Content-Length: 16 Content-Length: 16
content for you content for you
</datacheck> </datacheck>

4
tests/data/test176
Просмотреть файл

@ -15,7 +15,7 @@ Content-Type: text/html; charset=iso-8859-1
HTTP/1.1 200 moo swsclose HTTP/1.1 200 moo swsclose
Server: Microsoft-IIS/6.0 Server: Microsoft-IIS/6.0
Content-Type: text/html; charset=iso-8859-1 Content-Type: text/html; charset=iso-8859-1
Content-Length: 16 Content-Length: 16
content for you content for you
</data> </data>
@ -29,7 +29,7 @@ Content-Type: text/html; charset=iso-8859-1
HTTP/1.1 200 moo swsclose HTTP/1.1 200 moo swsclose
Server: Microsoft-IIS/6.0 Server: Microsoft-IIS/6.0
Content-Type: text/html; charset=iso-8859-1 Content-Type: text/html; charset=iso-8859-1
Content-Length: 16 Content-Length: 16
content for you content for you
</datacheck> </datacheck>

36
tests/data/test18
Просмотреть файл

@ -9,24 +9,24 @@ HTTP GET
# Server-side # Server-side
<reply> <reply>
<data nocheck="yes"> <data nocheck="yes">
HTTP/1.1 200 OK HTTP/1.1 200 OK
Funny-head: yesyes Funny-head: yesyes
Content-Length: 4 Content-Length: 4
moo moo
</data> </data>
<data2> <data2>
HTTP/1.1 200 OK HTTP/1.1 200 OK
Funny-head: yesyes Funny-head: yesyes
Content-Length: 4 Content-Length: 4
foo foo
</data2> </data2>
<data3> <data3>
HTTP/1.1 200 OK HTTP/1.1 200 OK
Funny-head: yesyes Funny-head: yesyes
Content-Length: 4 Content-Length: 4
hoo hoo
</data3> </data3>
</reply> </reply>
@ -68,22 +68,22 @@ Accept: */*
</protocol> </protocol>
<stdout> <stdout>
--_curl_--%HOSTIP:%HTTPPORT/18 --_curl_--%HOSTIP:%HTTPPORT/18
HTTP/1.1 200 OK HTTP/1.1 200 OK
Funny-head: yesyes Funny-head: yesyes
Content-Length: 4 Content-Length: 4
moo moo
--_curl_--%HOSTIP:%HTTPPORT/180002 --_curl_--%HOSTIP:%HTTPPORT/180002
HTTP/1.1 200 OK HTTP/1.1 200 OK
Funny-head: yesyes Funny-head: yesyes
Content-Length: 4 Content-Length: 4
foo foo
--_curl_--%HOSTIP:%HTTPPORT/180003 --_curl_--%HOSTIP:%HTTPPORT/180003
HTTP/1.1 200 OK HTTP/1.1 200 OK
Funny-head: yesyes Funny-head: yesyes
Content-Length: 4 Content-Length: 4
hoo hoo
</stdout> </stdout>
</verify> </verify>

6
tests/data/test22
Просмотреть файл

@ -9,10 +9,10 @@ long URL
# Server-side # Server-side
<reply> <reply>
<data> <data>
HTTP/1.1 200 OK HTTP/1.1 200 OK
Funny-head: yesyes Funny-head: yesyes
Content-Length: 27 Content-Length: 27
This is the proof it works This is the proof it works
</data> </data>
</reply> </reply>

4
tests/data/test273
Просмотреть файл

@ -12,7 +12,7 @@ HTTP Digest auth
HTTP/1.1 401 Authorization Required swsclose HTTP/1.1 401 Authorization Required swsclose
Server: Apache/1.3.27 (Darwin) PHP/4.1.2 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" WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
Content-Type: text/html; charset=iso-8859-1 Content-Type: text/html; charset=iso-8859-1
This is not the real page This is not the real page
@ -33,7 +33,7 @@ This IS the real page!
HTTP/1.1 401 Authorization Required swsclose HTTP/1.1 401 Authorization Required swsclose
Server: Apache/1.3.27 (Darwin) PHP/4.1.2 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" WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
Content-Type: text/html; charset=iso-8859-1 Content-Type: text/html; charset=iso-8859-1
HTTP/1.1 200 OK swsclose HTTP/1.1 200 OK swsclose

8
tests/data/test39
Просмотреть файл

@ -8,11 +8,11 @@ HTTP FORMPOST
# Server-side # Server-side
<reply> <reply>
<data> <data>
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
Content-Length: 10 Content-Length: 10
blablabla blablabla
</data> </data>
</reply> </reply>

20
tests/data/test40
Просмотреть файл

@ -17,11 +17,11 @@ Connection: close
</data> </data>
<data2> <data2>
HTTP/1.1 200 OK swsclose HTTP/1.1 200 OK swsclose
Location: this should be ignored Location: this should be ignored
Date: Thu, 09 Nov 2010 14:49:00 GMT Date: Thu, 09 Nov 2010 14:49:00 GMT
Connection: close Connection: close
body body
</data2> </data2>
<datacheck> <datacheck>
@ -30,11 +30,11 @@ Location: ../moo.html/?name=d a niel&testcase=/400002
Date: Thu, 09 Nov 2010 14:49:00 GMT Date: Thu, 09 Nov 2010 14:49:00 GMT
Connection: close Connection: close
HTTP/1.1 200 OK swsclose HTTP/1.1 200 OK swsclose
Location: this should be ignored Location: this should be ignored
Date: Thu, 09 Nov 2010 14:49:00 GMT Date: Thu, 09 Nov 2010 14:49:00 GMT
Connection: close Connection: close
body body
</datacheck> </datacheck>
</reply> </reply>

20
tests/data/test42
Просмотреть файл

@ -17,11 +17,11 @@ Connection: close
</data> </data>
<data2> <data2>
HTTP/1.1 200 OK swsclose HTTP/1.1 200 OK swsclose
Location: this should be ignored Location: this should be ignored
Date: Thu, 09 Nov 2010 14:49:00 GMT Date: Thu, 09 Nov 2010 14:49:00 GMT
Connection: close Connection: close
body body
</data2> </data2>
<datacheck> <datacheck>
@ -30,11 +30,11 @@ Location: ../m o o.html/420002
Date: Thu, 09 Nov 2010 14:49:00 GMT Date: Thu, 09 Nov 2010 14:49:00 GMT
Connection: close Connection: close
HTTP/1.1 200 OK swsclose HTTP/1.1 200 OK swsclose
Location: this should be ignored Location: this should be ignored
Date: Thu, 09 Nov 2010 14:49:00 GMT Date: Thu, 09 Nov 2010 14:49:00 GMT
Connection: close Connection: close
body body
</datacheck> </datacheck>
</reply> </reply>

22
tests/data/test46
Просмотреть файл

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

12
tests/data/test53
Просмотреть файл

@ -9,13 +9,13 @@ cookies
# Server-side # Server-side
<reply> <reply>
<data> <data>
HTTP/1.1 200 OK HTTP/1.1 200 OK
Server: Microsoft-IIS/4.0 Server: Microsoft-IIS/4.0
Date: Tue, 25 Sep 2001 19:37:44 GMT Date: Tue, 25 Sep 2001 19:37:44 GMT
Content-Type: text/html Content-Type: text/html
Connection: close Connection: close
Content-Length: 21 Content-Length: 21
This server says moo This server says moo
</data> </data>
</reply> </reply>