mirror of
https://github.com/curl/curl.git
synced 2026-04-13 00:31:41 +08:00
6cf3d7b1b1
- fix regex to not catch CR (from CRLF), in `PORT`, `EPRT`
commands, allowing to use `crlf="yes"` more.
- add `crlf="headers"` mode for `protocol` sections.
To call `subnewlines()` without its force option.
This is the mode used in `data` sections when `crlf="yes"`.
(This confusion may be subject to a future commit.)
- subnewlines: apply CRLF to `HEAD` and `CONNECT` HTTP requests.
- subnewlines: apply CRLF to RTSP requests.
- delete remaining empty `protocol` sections.
Reducing the number of `tests/data/test*`:
- CRLF newlines from 11325 to 10295. (119984 lines total)
- files with mixed newlines from 707 to 656. (1890 files total)
Follow-up to 4d2a05d3fe #19284
Closes #19318
61 lines
1.0 KiB
Plaintext
61 lines
1.0 KiB
Plaintext
<testcase>
|
|
<info>
|
|
<keywords>
|
|
FTP
|
|
PORT
|
|
RETR
|
|
NODATACONN
|
|
timeout
|
|
FAILURE
|
|
</keywords>
|
|
</info>
|
|
# Server-side
|
|
<reply>
|
|
<data nocheck="yes">
|
|
some bytes
|
|
</data>
|
|
<servercmd>
|
|
NODATACONN
|
|
</servercmd>
|
|
</reply>
|
|
|
|
# Client-side
|
|
<client>
|
|
<server>
|
|
ftp
|
|
</server>
|
|
<name>
|
|
FTP PORT download, no data conn and no positive preliminary reply
|
|
</name>
|
|
<command>
|
|
--max-time %FTPTIME2 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P -
|
|
</command>
|
|
|
|
</client>
|
|
|
|
# Verify data after the test has been "shot"
|
|
<verify>
|
|
<strippart>
|
|
s/^EPRT \|1\|(\S*)/EPRT \|1\|/
|
|
</strippart>
|
|
|
|
# The protocol part does not include QUIT simply because the error is
|
|
# CURLE_OPERATION_TIMEDOUT (28) which is a generic timeout error without
|
|
# specifically saying for which connection it concerns, and for timeouts libcurl
|
|
# marks the control channel as "invalid". As this test case times out for the
|
|
# data connection it could still use the control channel.
|
|
<protocol crlf="yes">
|
|
USER anonymous
|
|
PASS ftp@example.com
|
|
PWD
|
|
EPRT |1|
|
|
TYPE I
|
|
SIZE %TESTNUMBER
|
|
RETR %TESTNUMBER
|
|
</protocol>
|
|
<errorcode>
|
|
28
|
|
</errorcode>
|
|
</verify>
|
|
</testcase>
|