mirror of
https://github.com/curl/curl.git
synced 2026-01-31 03:44:53 +00: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 6cf3d7b1b161bc45501d17b401225befe3c43943 #19318
Follow-up to 4d2a05d3fe8ba4db9168b03057029ea5ce7dab77 #19284
Closes #19313
147 lines
2.1 KiB
Plaintext
147 lines
2.1 KiB
Plaintext
<testcase>
|
|
<info>
|
|
<keywords>
|
|
HTTP
|
|
HTTP GET
|
|
FTP
|
|
PASV
|
|
FILE
|
|
TFTP
|
|
TFTP RRQ
|
|
multiprotocol
|
|
</keywords>
|
|
</info>
|
|
|
|
#
|
|
# Server-side
|
|
<reply>
|
|
<data1 crlf="headers" nocheck="yes">
|
|
HTTP/1.1 200 OK
|
|
Date: Tue, 09 Nov 2010 14:49:00 GMT
|
|
Server: test-server/fake
|
|
Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
|
|
ETag: "21025-dc7-39462498"
|
|
Accept-Ranges: bytes
|
|
Content-Length: 6
|
|
Connection: close
|
|
Content-Type: text/html
|
|
Funny-head: yesyes
|
|
|
|
-foo-
|
|
</data1>
|
|
<data2 nocheck="yes">
|
|
data
|
|
to
|
|
see
|
|
that FTP
|
|
works
|
|
so does it?
|
|
</data2>
|
|
<data3 nocheck="yes">
|
|
a chunk of
|
|
data
|
|
returned
|
|
to TFTP client
|
|
</data3>
|
|
</reply>
|
|
|
|
#
|
|
# Client-side
|
|
<client>
|
|
<server>
|
|
http
|
|
ftp
|
|
file
|
|
tftp
|
|
</server>
|
|
<name>
|
|
HTTP GET, FTP RETR, FILE, TFTP RRQ then again in rev order
|
|
</name>
|
|
<command option="no-include">
|
|
http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER0003 tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER0003 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002 http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001
|
|
</command>
|
|
<file name="%LOGDIR/test%TESTNUMBER.txt">
|
|
foo
|
|
bar
|
|
bar
|
|
foo
|
|
moo
|
|
</file>
|
|
</client>
|
|
|
|
#
|
|
# Verify data after the test has been "shot"
|
|
<verify>
|
|
<strip>
|
|
^timeout = [5-6]$
|
|
</strip>
|
|
<protocol>
|
|
GET /%TESTNUMBER0001 HTTP/1.1
|
|
Host: %HOSTIP:%HTTPPORT
|
|
User-Agent: curl/%VERSION
|
|
Accept: */*
|
|
|
|
USER anonymous
|
|
PASS ftp@example.com
|
|
PWD
|
|
EPSV
|
|
TYPE I
|
|
SIZE %TESTNUMBER0002
|
|
RETR %TESTNUMBER0002
|
|
opcode = 1
|
|
mode = octet
|
|
tsize = 0
|
|
blksize = 512
|
|
filename = /%TESTNUMBER0003
|
|
opcode = 1
|
|
mode = octet
|
|
tsize = 0
|
|
blksize = 512
|
|
filename = /%TESTNUMBER0003
|
|
EPSV
|
|
SIZE %TESTNUMBER0002
|
|
RETR %TESTNUMBER0002
|
|
GET /%TESTNUMBER0001 HTTP/1.1
|
|
Host: %HOSTIP:%HTTPPORT
|
|
User-Agent: curl/%VERSION
|
|
Accept: */*
|
|
|
|
QUIT
|
|
</protocol>
|
|
<stdout>
|
|
-foo-
|
|
data
|
|
to
|
|
see
|
|
that FTP
|
|
works
|
|
so does it?
|
|
foo
|
|
bar
|
|
bar
|
|
foo
|
|
moo
|
|
a chunk of
|
|
data
|
|
returned
|
|
to TFTP client
|
|
a chunk of
|
|
data
|
|
returned
|
|
to TFTP client
|
|
foo
|
|
bar
|
|
bar
|
|
foo
|
|
moo
|
|
data
|
|
to
|
|
see
|
|
that FTP
|
|
works
|
|
so does it?
|
|
-foo-
|
|
</stdout>
|
|
</verify>
|
|
</testcase>
|