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
72 lines
1.2 KiB
Plaintext
72 lines
1.2 KiB
Plaintext
<testcase>
|
|
<info>
|
|
<keywords>
|
|
FTP
|
|
RETR
|
|
</keywords>
|
|
</info>
|
|
|
|
# Server-side
|
|
<reply>
|
|
# file%TESTNUMBER contents...
|
|
<data crlf="headers" nocheck="yes">
|
|
HTTP/1.1 200 OK
|
|
Date: Tue, 09 Nov 2010 14:49:00 GMT
|
|
Server: test-server/fake
|
|
Content-Length: 6
|
|
Connection: close
|
|
Content-Type: text/html
|
|
Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
|
|
|
|
MOOOO
|
|
</data>
|
|
</reply>
|
|
|
|
# Client-side
|
|
<client>
|
|
<server>
|
|
ftp
|
|
</server>
|
|
<name>
|
|
FTP download, file with C-D inside, using -O -i, without -D
|
|
</name>
|
|
<command option="no-output,no-include">
|
|
ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i --output-dir %LOGDIR
|
|
</command>
|
|
</client>
|
|
|
|
# Verify data after the test has been "shot"
|
|
<verify>
|
|
<protocol crlf="yes">
|
|
USER anonymous
|
|
PASS ftp@example.com
|
|
PWD
|
|
CWD path
|
|
EPSV
|
|
TYPE I
|
|
SIZE file%TESTNUMBER
|
|
RETR file%TESTNUMBER
|
|
QUIT
|
|
</protocol>
|
|
|
|
<file1 name="%LOGDIR/file%TESTNUMBER" crlf="headers">
|
|
HTTP/1.1 200 OK
|
|
Date: Tue, 09 Nov 2010 14:49:00 GMT
|
|
Server: test-server/fake
|
|
Content-Length: 6
|
|
Connection: close
|
|
Content-Type: text/html
|
|
Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
|
|
|
|
MOOOO
|
|
</file1>
|
|
|
|
<file2 name="%LOGDIR/stdout%TESTNUMBER">
|
|
</file2>
|
|
|
|
<notexists>
|
|
%LOGDIR/name%TESTNUMBER
|
|
</notexists>
|
|
</verify>
|
|
</testcase>
|