mirror of
https://github.com/curl/curl.git
synced 2026-04-12 12:21:42 +08:00
63e9721b63
- `reply/data*`, `verify/stdout`, `verify/stderr`, `verify/file*`,
`verify/proxy`:
- make `crlf="yes"` force CRLF to all lines, instead of just applying
to HTTP protocol headers.
- add support for `crlf="headers"` that only converts HTTP protocol
header lines to CRLF. (previously done via `crlf="yes"`.)
- use `crlf="headers"` where possible.
- `reply/connect*`:
- add support for `crlf="yes"` and `crlf="headers"`.
- use them where possible.
- `client/file*`, `client/stdin`:
- add support for `crlf="yes"`.
- use it where possible.
- `reply/data*`, `verify/protocol`:
- replace existing uses of `crlf="yes"` with `crlf="headers`" where it
does not change the result.
Reducing the number of `tests/data/test*`:
- CRLF newlines from 10295 to 1985. (119985 lines total)
- files with mixed newlines from 656 to 113. (1890 files total)
After this patch there remain 141 sections with mixed newlines, where
the mixing is not split between headers/non-headers. There is no obvious
pattern here. Some of the CRLF uses might be accidental, or
non-significant. They will be tackled in a future patch.
Follow-up to 6cf3d7b1b1 #19318
Follow-up to 4d2a05d3fe #19284
Closes #19313
114 lines
2.2 KiB
Plaintext
114 lines
2.2 KiB
Plaintext
<testcase>
|
|
<info>
|
|
<keywords>
|
|
HTTP
|
|
HTTP proxy
|
|
HTTP Basic auth
|
|
HTTP proxy Basic auth
|
|
followlocation
|
|
--anyauth
|
|
</keywords>
|
|
</info>
|
|
|
|
#
|
|
# Server-side
|
|
<reply>
|
|
<data1000 crlf="headers" nocheck="yes">
|
|
HTTP/1.1 401 Authorization Required
|
|
WWW-Authenticate: Basic
|
|
Content-Type: text/plain
|
|
Content-Length: 0
|
|
|
|
</data1000>
|
|
<data1001 crlf="headers" nocheck="yes">
|
|
HTTP/1.1 302 OK
|
|
Date: Tue, 09 Nov 2010 14:49:00 GMT
|
|
Server: test-server/fake swsclose
|
|
Content-Type: text/plain
|
|
Funny-head: yesyes
|
|
Location: http://goto.second.host.now/%TESTNUMBER1002
|
|
Content-Length: 0
|
|
Connection: close
|
|
|
|
</data1001>
|
|
<data1002 crlf="headers" nocheck="yes">
|
|
HTTP/1.1 200 OK
|
|
Date: Tue, 09 Nov 2010 14:49:00 GMT
|
|
Server: test-server/fake swsclose
|
|
Content-Type: text/plain
|
|
Funny-head: yesyes
|
|
Content-Length: 9
|
|
|
|
contents
|
|
</data1002>
|
|
|
|
<datacheck crlf="headers">
|
|
HTTP/1.1 401 Authorization Required
|
|
WWW-Authenticate: Basic
|
|
Content-Type: text/plain
|
|
Content-Length: 0
|
|
|
|
HTTP/1.1 302 OK
|
|
Date: Tue, 09 Nov 2010 14:49:00 GMT
|
|
Server: test-server/fake swsclose
|
|
Content-Type: text/plain
|
|
Funny-head: yesyes
|
|
Location: http://goto.second.host.now/%TESTNUMBER1002
|
|
Content-Length: 0
|
|
Connection: close
|
|
|
|
HTTP/1.1 200 OK
|
|
Date: Tue, 09 Nov 2010 14:49:00 GMT
|
|
Server: test-server/fake swsclose
|
|
Content-Type: text/plain
|
|
Funny-head: yesyes
|
|
Content-Length: 9
|
|
|
|
contents
|
|
</datacheck>
|
|
</reply>
|
|
|
|
#
|
|
# Client-side
|
|
<client>
|
|
<server>
|
|
http
|
|
</server>
|
|
<name>
|
|
HTTP, proxy with --anyauth and Location: to new host
|
|
</name>
|
|
<command>
|
|
http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 -x %HOSTIP:%HTTPPORT --user iam:myself --location --anyauth
|
|
</command>
|
|
<features>
|
|
proxy
|
|
</features>
|
|
</client>
|
|
|
|
#
|
|
# Verify data after the test has been "shot"
|
|
<verify>
|
|
<protocol crlf="headers">
|
|
GET http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 HTTP/1.1
|
|
Host: first.host.it.is
|
|
User-Agent: curl/%VERSION
|
|
Accept: */*
|
|
Proxy-Connection: Keep-Alive
|
|
|
|
GET http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 HTTP/1.1
|
|
Host: first.host.it.is
|
|
Authorization: Basic %b64[iam:myself]b64%
|
|
User-Agent: curl/%VERSION
|
|
Accept: */*
|
|
Proxy-Connection: Keep-Alive
|
|
|
|
GET http://goto.second.host.now/%TESTNUMBER1002 HTTP/1.1
|
|
Host: goto.second.host.now
|
|
User-Agent: curl/%VERSION
|
|
Accept: */*
|
|
Proxy-Connection: Keep-Alive
|
|
|
|
</protocol>
|
|
</verify>
|
|
</testcase>
|