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
128 lines
2.1 KiB
Plaintext
128 lines
2.1 KiB
Plaintext
<testcase>
|
|
<info>
|
|
<keywords>
|
|
HTTP
|
|
HTTP GET
|
|
Content-Range
|
|
Resume
|
|
retry
|
|
</keywords>
|
|
</info>
|
|
|
|
# Server-side
|
|
<reply>
|
|
|
|
#
|
|
# the first chunk
|
|
#
|
|
<data crlf="headers" nocheck="yes" nonewline="yes">
|
|
HTTP/1.1 200 OK swsbounce swsclose
|
|
Accept-Ranges: bytes
|
|
Content-Type: text/html
|
|
Content-Length: 26
|
|
|
|
abcde
|
|
</data>
|
|
|
|
#
|
|
# the second chunk
|
|
#
|
|
<data1 crlf="headers" nocheck="yes" nonewline="yes">
|
|
HTTP/1.1 206 Partial Content swsbounce swsclose
|
|
Content-Type: text/html
|
|
Content-Length: 21
|
|
Content-Range: bytes 5-25/26
|
|
|
|
fghijk
|
|
</data1>
|
|
|
|
#
|
|
# some nonsense that curl should ignore as unresumable
|
|
#
|
|
<data2 crlf="headers" nocheck="yes">
|
|
HTTP/1.1 404 Not Found swsbounce
|
|
Content-Type: text/html
|
|
Content-Length: 5
|
|
|
|
body
|
|
</data2>
|
|
|
|
#
|
|
# some more nonsense that curl should ignore as unresumable
|
|
#
|
|
<data3 crlf="headers" nocheck="yes">
|
|
HTTP/1.1 200 OK swsbounce
|
|
Accept-Ranges: bytes
|
|
Content-Type: text/html
|
|
Content-Length: 30
|
|
|
|
XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
|
|
</data3>
|
|
|
|
#
|
|
# the third chunk
|
|
#
|
|
<data4 nocheck="yes" nonewline="yes">
|
|
HTTP/1.1 206 Partial Content swsbounce swsclose
|
|
Content-Type: text/html
|
|
Content-Length: 15
|
|
Content-Range: bytes 11-25/26
|
|
|
|
lmnopqrstuvwxyz
|
|
</data4>
|
|
</reply>
|
|
|
|
# Client-side
|
|
<client>
|
|
<server>
|
|
http
|
|
</server>
|
|
<name>
|
|
HTTP retry failed download with keep data and auto-resume
|
|
</name>
|
|
<command option="no-output,no-include">
|
|
--continue-at - --retry 4 --retry-delay 1 --retry-all-errors -o %LOGDIR/outfile%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER
|
|
</command>
|
|
</client>
|
|
|
|
# Verify data after the test has been "shot"
|
|
<verify>
|
|
<protocol crlf="headers">
|
|
GET /%TESTNUMBER HTTP/1.1
|
|
Host: %HOSTIP:%HTTPPORT
|
|
User-Agent: curl/%VERSION
|
|
Accept: */*
|
|
|
|
GET /%TESTNUMBER HTTP/1.1
|
|
Host: %HOSTIP:%HTTPPORT
|
|
Range: bytes=5-
|
|
User-Agent: curl/%VERSION
|
|
Accept: */*
|
|
|
|
GET /%TESTNUMBER HTTP/1.1
|
|
Host: %HOSTIP:%HTTPPORT
|
|
Range: bytes=11-
|
|
User-Agent: curl/%VERSION
|
|
Accept: */*
|
|
|
|
GET /%TESTNUMBER HTTP/1.1
|
|
Host: %HOSTIP:%HTTPPORT
|
|
Range: bytes=11-
|
|
User-Agent: curl/%VERSION
|
|
Accept: */*
|
|
|
|
GET /%TESTNUMBER HTTP/1.1
|
|
Host: %HOSTIP:%HTTPPORT
|
|
Range: bytes=11-
|
|
User-Agent: curl/%VERSION
|
|
Accept: */*
|
|
|
|
</protocol>
|
|
|
|
<file1 name="%LOGDIR/outfile%TESTNUMBER" nonewline="yes">
|
|
abcdefghijklmnopqrstuvwxyz
|
|
</file1>
|
|
|
|
</verify>
|
|
</testcase>
|