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
102 lines
2.4 KiB
Plaintext
102 lines
2.4 KiB
Plaintext
<testcase>
|
|
<info>
|
|
<keywords>
|
|
SMTP
|
|
MULTIPART
|
|
</keywords>
|
|
</info>
|
|
|
|
#
|
|
# Server-side
|
|
<reply>
|
|
</reply>
|
|
|
|
#
|
|
# Client-side
|
|
<client>
|
|
<features>
|
|
Mime
|
|
</features>
|
|
<server>
|
|
smtp
|
|
</server>
|
|
<name>
|
|
SMTP multipart using mime API
|
|
</name>
|
|
<stdin crlf="yes">
|
|
From: different
|
|
To: another
|
|
|
|
body
|
|
</stdin>
|
|
<command>
|
|
smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -F "=(;type=multipart/alternative" -F "= <body>This is the html version</body>;headers=X-test1: this is a header;type=text/html;headers=X-test2: this is another header " -F "=This is the plain text version;headers=@%LOGDIR/headers%TESTNUMBER" -F "=)" -F "=@%LOGDIR/test%TESTNUMBER.txt;headers=<%LOGDIR/headers%TESTNUMBER" -H "From: different" -H "To: another" -H "Reply-To: <followup@example.com>"
|
|
</command>
|
|
<file1 name="%LOGDIR/test%TESTNUMBER.txt">
|
|
This is an attached file.
|
|
|
|
It may contain any type of data.
|
|
</file1>
|
|
<file2 name="%LOGDIR/headers%TESTNUMBER">
|
|
# This line is a comment
|
|
X-fileheader1: This is a header from a file%spc%
|
|
|
|
# This line is another comment. It precedes a folded header.
|
|
X-fileheader2: This is #a
|
|
folded header
|
|
</file2>
|
|
</client>
|
|
|
|
#
|
|
# Verify data after the test has been "shot"
|
|
<verify>
|
|
<strippart>
|
|
s/^--------------------------[A-Za-z0-9]*/------------------------------/
|
|
s/boundary=------------------------[A-Za-z0-9]*/boundary=----------------------------/
|
|
</strippart>
|
|
<protocol crlf="yes">
|
|
EHLO %TESTNUMBER
|
|
MAIL FROM:<sender@example.com>
|
|
RCPT TO:<recipient@example.com>
|
|
DATA
|
|
QUIT
|
|
</protocol>
|
|
<upload>
|
|
Content-Type: multipart/mixed; boundary=----------------------------
|
|
Mime-Version: 1.0
|
|
From: different
|
|
To: another
|
|
Reply-To: <followup@example.com>
|
|
|
|
------------------------------
|
|
Content-Type: multipart/alternative; boundary=----------------------------
|
|
|
|
------------------------------
|
|
Content-Type: text/html
|
|
Content-Transfer-Encoding: 8bit
|
|
X-test1: this is a header
|
|
X-test2: this is another header
|
|
|
|
<body>This is the html version</body>
|
|
------------------------------
|
|
X-fileheader1: This is a header from a file
|
|
X-fileheader2: This is #a folded header
|
|
|
|
This is the plain text version
|
|
--------------------------------
|
|
|
|
------------------------------
|
|
Content-Disposition: attachment; filename="test%TESTNUMBER.txt"
|
|
X-fileheader1: This is a header from a file
|
|
X-fileheader2: This is #a folded header
|
|
|
|
This is an attached file.
|
|
|
|
It may contain any type of data.
|
|
|
|
--------------------------------
|
|
.
|
|
</upload>
|
|
</verify>
|
|
</testcase>
|