mirror of
https://github.com/curl/curl.git
synced 2026-04-12 00:11: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
110 lines
2.1 KiB
Plaintext
110 lines
2.1 KiB
Plaintext
<testcase>
|
|
<info>
|
|
<keywords>
|
|
HTTP
|
|
HTTP GET
|
|
HTTP CONNECT
|
|
HTTP proxy
|
|
proxytunnel
|
|
HTTP proxy Digest auth
|
|
</keywords>
|
|
</info>
|
|
|
|
# Server-side
|
|
<reply>
|
|
<servercmd>
|
|
connection-monitor
|
|
auth_required
|
|
</servercmd>
|
|
|
|
|
|
# this is returned first since we get no proxy-auth
|
|
<connect crlf="headers">
|
|
HTTP/1.1 407 Authorization Required to proxy me my dear
|
|
Proxy-Authenticate: Digest realm="weirdorealm", nonce="12345"
|
|
Content-Length: 33
|
|
|
|
And you should ignore this data.
|
|
</connect>
|
|
|
|
# this is returned when we get a GET!
|
|
<data2>
|
|
HTTP/1.1 200 OK
|
|
Date: Tue, 09 Nov 2010 14:49:00 GMT
|
|
Content-Length: 7
|
|
Connection: close
|
|
Content-Type: text/html
|
|
Funny-head: yesyes
|
|
|
|
daniel
|
|
</data2>
|
|
|
|
# then this is returned when we get proxy-auth
|
|
<connect1000>
|
|
HTTP/1.1 200 OK
|
|
Server: no
|
|
|
|
</connect1000>
|
|
|
|
<datacheck>
|
|
HTTP/1.1 407 Authorization Required to proxy me my dear
|
|
Proxy-Authenticate: Digest realm="weirdorealm", nonce="12345"
|
|
Content-Length: 33
|
|
|
|
HTTP/1.1 200 OK
|
|
Server: no
|
|
|
|
HTTP/1.1 200 OK
|
|
Date: Tue, 09 Nov 2010 14:49:00 GMT
|
|
Content-Length: 7
|
|
Connection: close
|
|
Content-Type: text/html
|
|
Funny-head: yesyes
|
|
|
|
daniel
|
|
</datacheck>
|
|
</reply>
|
|
|
|
# Client-side
|
|
<client>
|
|
<server>
|
|
http
|
|
</server>
|
|
<features>
|
|
!SSPI
|
|
crypto
|
|
proxy
|
|
digest
|
|
</features>
|
|
<name>
|
|
HTTP proxy CONNECT auth Digest
|
|
</name>
|
|
<command>
|
|
http://test.remote.haxx.se.%TESTNUMBER:8990/path/%TESTNUMBER0002 --proxy=http://%HOSTIP:%HTTPPORT --proxy-user=silly:person --proxy-digest --proxytunnel
|
|
</command>
|
|
</client>
|
|
|
|
# Verify data after the test has been "shot"
|
|
<verify>
|
|
<protocol crlf="headers">
|
|
CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1
|
|
Host: test.remote.haxx.se.%TESTNUMBER:8990
|
|
User-Agent: curl/%VERSION
|
|
Proxy-Connection: Keep-Alive
|
|
|
|
CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1
|
|
Host: test.remote.haxx.se.%TESTNUMBER:8990
|
|
Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.%TESTNUMBER:8990", response="003e36decb4dbf6366b3ecb9b87c24ec"
|
|
User-Agent: curl/%VERSION
|
|
Proxy-Connection: Keep-Alive
|
|
|
|
GET /path/%TESTNUMBER0002 HTTP/1.1
|
|
Host: test.remote.haxx.se.%TESTNUMBER:8990
|
|
User-Agent: curl/%VERSION
|
|
Accept: */*
|
|
|
|
[DISCONNECT]
|
|
</protocol>
|
|
</verify>
|
|
</testcase>
|