mirror of
https://github.com/curl/curl.git
synced 2026-04-12 00:11:42 +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
65 lines
994 B
Plaintext
65 lines
994 B
Plaintext
<testcase>
|
|
<info>
|
|
<keywords>
|
|
FTP
|
|
EPRT
|
|
</keywords>
|
|
</info>
|
|
|
|
# Server-side
|
|
<reply>
|
|
<data>
|
|
data blobb
|
|
</data>
|
|
<servercmd>
|
|
REPLY EPRT 500 no such command
|
|
</servercmd>
|
|
</reply>
|
|
|
|
# Client-side
|
|
<client>
|
|
<server>
|
|
ftp
|
|
</server>
|
|
# EPRT is only sent when IPv6 is enabled
|
|
<features>
|
|
IPv6
|
|
</features>
|
|
<name>
|
|
Get two FTP files with no remote EPRT support
|
|
</name>
|
|
<command>
|
|
ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER -P -
|
|
</command>
|
|
<stdout>
|
|
data blobb
|
|
data blobb
|
|
</stdout>
|
|
</client>
|
|
|
|
# Verify data after the test has been "shot"
|
|
<verify>
|
|
# Strip the addresses and port number but leave the rest
|
|
<strippart>
|
|
s/^(EPRT \|1\|)\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\|\d{1,5}\|/$1/
|
|
s/^(PORT )\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}/$1/
|
|
</strippart>
|
|
<protocol crlf="yes">
|
|
USER anonymous
|
|
PASS ftp@example.com
|
|
PWD
|
|
CWD a
|
|
CWD path
|
|
EPRT |1|
|
|
PORT%spc%
|
|
TYPE I
|
|
SIZE %TESTNUMBER
|
|
RETR %TESTNUMBER
|
|
PORT%spc%
|
|
SIZE %TESTNUMBER
|
|
RETR %TESTNUMBER
|
|
QUIT
|
|
</protocol>
|
|
</verify>
|
|
</testcase>
|