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
88 lines
1.6 KiB
Plaintext
88 lines
1.6 KiB
Plaintext
<testcase>
|
|
<info>
|
|
<keywords>
|
|
HTTP
|
|
HTTP GET
|
|
Range
|
|
DELAY
|
|
</keywords>
|
|
</info>
|
|
|
|
# Server-side
|
|
<reply>
|
|
<data crlf="headers" nocheck="yes">
|
|
HTTP/1.1 416 Requested Range Not Satisfiable
|
|
Date: Tue, 09 Sep 2010 14:49:00 GMT
|
|
Accept-Ranges: bytes
|
|
Content-Length: 115
|
|
|
|
This is a long error message that is large enough that the test server is
|
|
guaranteed to split it into two packets.
|
|
</data>
|
|
|
|
<data1 crlf="headers">
|
|
HTTP/1.1 206 Partial Content
|
|
Date: Tue, 09 Sep 2010 14:49:01 GMT
|
|
Accept-Ranges: bytes
|
|
Content-Range: bytes 10-18/155
|
|
Content-Length: 13
|
|
Content-Type: text/plain
|
|
|
|
partial body
|
|
</data1>
|
|
|
|
<servercmd>
|
|
writedelay: 100
|
|
</servercmd>
|
|
</reply>
|
|
|
|
# Client-side
|
|
<client>
|
|
<server>
|
|
http
|
|
</server>
|
|
<name>
|
|
HTTP with invalid range then another URL
|
|
</name>
|
|
<command>
|
|
-r 10-22 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/wantmore/%TESTNUMBER0001
|
|
</command>
|
|
</client>
|
|
|
|
# Verify data after the test has been "shot"
|
|
<verify>
|
|
<stdout crlf="headers">
|
|
HTTP/1.1 416 Requested Range Not Satisfiable
|
|
Date: Tue, 09 Sep 2010 14:49:00 GMT
|
|
Accept-Ranges: bytes
|
|
Content-Length: 115
|
|
|
|
This is a long error message that is large enough that the test server is
|
|
guaranteed to split it into two packets.
|
|
HTTP/1.1 206 Partial Content
|
|
Date: Tue, 09 Sep 2010 14:49:01 GMT
|
|
Accept-Ranges: bytes
|
|
Content-Range: bytes 10-18/155
|
|
Content-Length: 13
|
|
Content-Type: text/plain
|
|
|
|
partial body
|
|
</stdout>
|
|
|
|
<protocol crlf="headers">
|
|
GET /want/%TESTNUMBER HTTP/1.1
|
|
Host: %HOSTIP:%HTTPPORT
|
|
Range: bytes=10-22
|
|
User-Agent: curl/%VERSION
|
|
Accept: */*
|
|
|
|
GET /wantmore/%TESTNUMBER0001 HTTP/1.1
|
|
Host: %HOSTIP:%HTTPPORT
|
|
Range: bytes=10-22
|
|
User-Agent: curl/%VERSION
|
|
Accept: */*
|
|
|
|
</protocol>
|
|
</verify>
|
|
</testcase>
|