mirror of
https://github.com/curl/curl.git
synced 2026-04-13 00:31:41 +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
136 lines
3.5 KiB
Plaintext
136 lines
3.5 KiB
Plaintext
<testcase>
|
|
# Based on test900
|
|
# N.B. --libcurl output not sufficient to deal with uploaded files.
|
|
<info>
|
|
<keywords>
|
|
SMTP
|
|
--libcurl
|
|
</keywords>
|
|
</info>
|
|
|
|
#
|
|
# Server-side
|
|
<reply>
|
|
<servercmd>
|
|
CAPA SIZE
|
|
</servercmd>
|
|
</reply>
|
|
|
|
#
|
|
# Client-side
|
|
<client>
|
|
<server>
|
|
smtp
|
|
</server>
|
|
<name>
|
|
--libcurl for SMTP
|
|
</name>
|
|
<setenv>
|
|
SSL_CERT_FILE
|
|
</setenv>
|
|
<file name="%LOGDIR/test%TESTNUMBER.eml" crlf="yes">
|
|
From: different
|
|
To: another
|
|
|
|
body
|
|
</file>
|
|
<command>
|
|
smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient.one@example.com --mail-rcpt recipient.two@example.com --mail-from sender@example.com -T %LOGDIR/test%TESTNUMBER.eml --libcurl %LOGDIR/test%TESTNUMBER.c
|
|
</command>
|
|
# Need ftp so the FTP options are written in the --libcurl template
|
|
<features>
|
|
ftp
|
|
--libcurl
|
|
</features>
|
|
</client>
|
|
|
|
#
|
|
# Verify data after the test has been "shot"
|
|
<verify>
|
|
<protocol crlf="yes">
|
|
EHLO %TESTNUMBER
|
|
MAIL FROM:<sender@example.com> SIZE=38
|
|
RCPT TO:<recipient.one@example.com>
|
|
RCPT TO:<recipient.two@example.com>
|
|
DATA
|
|
QUIT
|
|
</protocol>
|
|
<upload crlf="yes">
|
|
From: different
|
|
To: another
|
|
|
|
body
|
|
.
|
|
</upload>
|
|
<file name="%LOGDIR/test%TESTNUMBER.c" mode="text">
|
|
/********* Sample code generated by the curl command line tool **********
|
|
* All curl_easy_setopt() options are documented at:
|
|
* https://curl.se/libcurl/c/curl_easy_setopt.html
|
|
************************************************************************/
|
|
#include <curl/curl.h>
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
CURLcode ret;
|
|
CURL *hnd;
|
|
struct curl_slist *slist1;
|
|
|
|
slist1 = NULL;
|
|
slist1 = curl_slist_append(slist1, "recipient.one@example.com");
|
|
slist1 = curl_slist_append(slist1, "recipient.two@example.com");
|
|
|
|
hnd = curl_easy_init();
|
|
curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L);
|
|
curl_easy_setopt(hnd, CURLOPT_BUFFERSIZE, 102400L);
|
|
curl_easy_setopt(hnd, CURLOPT_URL, "smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER");
|
|
curl_easy_setopt(hnd, CURLOPT_UPLOAD, 1L);
|
|
curl_easy_setopt(hnd, CURLOPT_TCP_KEEPALIVE, 1L);
|
|
curl_easy_setopt(hnd, CURLOPT_MAIL_FROM, "sender@example.com");
|
|
curl_easy_setopt(hnd, CURLOPT_MAIL_RCPT, slist1);
|
|
curl_easy_setopt(hnd, CURLOPT_INFILESIZE_LARGE, (curl_off_t)38);
|
|
|
|
/* Here is a list of options the curl code used that cannot get generated
|
|
as source easily. You may choose to either not use them or implement
|
|
them yourself.
|
|
|
|
CURLOPT_DEBUGFUNCTION was set to a function pointer
|
|
CURLOPT_DEBUGDATA was set to an object pointer
|
|
CURLOPT_WRITEDATA was set to an object pointer
|
|
CURLOPT_WRITEFUNCTION was set to a function pointer
|
|
CURLOPT_READDATA was set to an object pointer
|
|
CURLOPT_READFUNCTION was set to a function pointer
|
|
CURLOPT_SEEKDATA was set to an object pointer
|
|
CURLOPT_SEEKFUNCTION was set to a function pointer
|
|
CURLOPT_HEADERFUNCTION was set to a function pointer
|
|
CURLOPT_HEADERDATA was set to an object pointer
|
|
CURLOPT_ERRORBUFFER was set to an object pointer
|
|
CURLOPT_STDERR was set to an object pointer
|
|
|
|
*/
|
|
|
|
ret = curl_easy_perform(hnd);
|
|
|
|
curl_easy_cleanup(hnd);
|
|
hnd = NULL;
|
|
curl_slist_free_all(slist1);
|
|
slist1 = NULL;
|
|
|
|
return (int)ret;
|
|
}
|
|
/**** End of sample code ****/
|
|
</file>
|
|
<stripfile>
|
|
# These options vary with configurations - just ignore them
|
|
# CURLOPT_INTERLEAVEDATA requires RTSP (HTTP) protocol
|
|
$_ = '' if /CURLOPT_USERAGENT/
|
|
$_ = '' if /CURLOPT_MAXREDIRS/
|
|
$_ = '' if /CURLOPT_SSL_VERIFYPEER/
|
|
$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
|
|
$_ = '' if /CURLOPT_HTTP_VERSION/
|
|
$_ = '' if /CURLOPT_HTTP09_ALLOWED/
|
|
$_ = '' if /CURLOPT_INTERLEAVEDATA/
|
|
$_ = '' if /CURLOPT_SSLVERSION/
|
|
</stripfile>
|
|
</verify>
|
|
</testcase>
|