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
72 lines
1020 B
Plaintext
72 lines
1020 B
Plaintext
<testcase>
|
|
<info>
|
|
<keywords>
|
|
SMTP
|
|
HTTP
|
|
HTTP CONNECT
|
|
HTTP proxy
|
|
</keywords>
|
|
</info>
|
|
|
|
#
|
|
# Server-side
|
|
<reply>
|
|
<connect crlf="headers">
|
|
HTTP/1.1 200 Mighty fine indeed
|
|
smtp: sure hit me
|
|
|
|
</connect>
|
|
</reply>
|
|
|
|
#
|
|
# Client-side
|
|
<client>
|
|
<server>
|
|
smtp
|
|
http-proxy
|
|
</server>
|
|
<features>
|
|
http
|
|
proxy
|
|
</features>
|
|
<name>
|
|
SMTP send tunneled through HTTP proxy
|
|
</name>
|
|
<stdin crlf="yes">
|
|
From: different
|
|
To: another
|
|
|
|
body
|
|
</stdin>
|
|
<command>
|
|
smtp://smtp.%TESTNUMBER:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T - -p -x %HOSTIP:%PROXYPORT
|
|
</command>
|
|
</client>
|
|
|
|
#
|
|
# Verify data after the test has been "shot"
|
|
<verify>
|
|
<protocol crlf="yes">
|
|
EHLO %TESTNUMBER
|
|
MAIL FROM:<sender@example.com>
|
|
RCPT TO:<recipient@example.com>
|
|
DATA
|
|
QUIT
|
|
</protocol>
|
|
<upload crlf="yes">
|
|
From: different
|
|
To: another
|
|
|
|
body
|
|
.
|
|
</upload>
|
|
<proxy crlf="headers">
|
|
CONNECT smtp.%TESTNUMBER:%SMTPPORT HTTP/1.1
|
|
Host: smtp.%TESTNUMBER:%SMTPPORT
|
|
User-Agent: curl/%VERSION
|
|
Proxy-Connection: Keep-Alive
|
|
|
|
</proxy>
|
|
</verify>
|
|
</testcase>
|