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
74 lines
1.1 KiB
Plaintext
74 lines
1.1 KiB
Plaintext
<testcase>
|
|
<info>
|
|
<keywords>
|
|
HTTP
|
|
HTTP CONNECT
|
|
</keywords>
|
|
</info>
|
|
#
|
|
# Server-side
|
|
<reply>
|
|
<connect>
|
|
HTTP/1.1 200 Mighty fine indeed
|
|
|
|
</connect>
|
|
|
|
<data nocheck="yes">
|
|
HTTP/1.1 404 Not Found
|
|
Server: nginx/1.23.2
|
|
Date: Wed, 09 Nov 2022 09:44:58 GMT
|
|
Content-Type: text/plain; charset=utf-8
|
|
Content-Length: 4
|
|
Connection: keep-alive
|
|
X-Content-Type-Options: nosniff
|
|
|
|
haha
|
|
</data>
|
|
|
|
</reply>
|
|
|
|
#
|
|
# Client-side
|
|
<client>
|
|
<server>
|
|
http
|
|
http-proxy
|
|
</server>
|
|
<name>
|
|
HTTP GET when PROXY Protocol enabled behind a proxy
|
|
</name>
|
|
<command>
|
|
--haproxy-protocol http://%HOSTIP:%HTTPPORT/page --proxytunnel -x %HOSTIP:%PROXYPORT
|
|
</command>
|
|
<features>
|
|
proxy
|
|
</features>
|
|
</client>
|
|
|
|
#
|
|
# Verify data after the test has been "shot"
|
|
<verify>
|
|
<strippart>
|
|
s/^PROXY TCP4 %CLIENTIP %HOSTIP (\d*) %PROXYPORT/proxy-line/
|
|
</strippart>
|
|
|
|
<proxy crlf="headers">
|
|
CONNECT %HOSTIP:%HTTPPORT HTTP/1.1
|
|
Host: %HOSTIP:%HTTPPORT
|
|
User-Agent: curl/%VERSION
|
|
Proxy-Connection: Keep-Alive
|
|
|
|
</proxy>
|
|
|
|
<protocol crlf="yes">
|
|
proxy-line
|
|
GET /page HTTP/1.1
|
|
Host: %HOSTIP:%HTTPPORT
|
|
User-Agent: curl/%VERSION
|
|
Accept: */*
|
|
|
|
</protocol>
|
|
|
|
</verify>
|
|
</testcase>
|