mirror of
https://github.com/curl/curl.git
synced 2026-07-24 17:47:34 +03:00
tests: avoid hard-coded CRLFs in more sections
- `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
This commit is contained in:
parent
6adefe8ad0
commit
63e9721b63
1096 changed files with 10495 additions and 10422 deletions
|
|
@ -10,23 +10,23 @@ Duplicate-header
|
|||
|
||||
# Server-side
|
||||
<reply>
|
||||
<data>
|
||||
HTTP/1.1 302 eat this!
|
||||
Date: Tue, 09 Nov 2010 14:49:00 GMT
|
||||
Server: test-server/fake
|
||||
Location: this-is-the-first.html
|
||||
Content-Length: 0
|
||||
Connection: close
|
||||
Location: and there's a second one too! / moo.html
|
||||
|
||||
<data crlf="headers">
|
||||
HTTP/1.1 302 eat this!
|
||||
Date: Tue, 09 Nov 2010 14:49:00 GMT
|
||||
Server: test-server/fake
|
||||
Location: this-is-the-first.html
|
||||
Content-Length: 0
|
||||
Connection: close
|
||||
Location: and there's a second one too! / moo.html
|
||||
|
||||
</data>
|
||||
<datacheck>
|
||||
HTTP/1.1 302 eat this!
|
||||
Date: Tue, 09 Nov 2010 14:49:00 GMT
|
||||
Server: test-server/fake
|
||||
Location: this-is-the-first.html
|
||||
Content-Length: 0
|
||||
Connection: close
|
||||
<datacheck crlf="headers">
|
||||
HTTP/1.1 302 eat this!
|
||||
Date: Tue, 09 Nov 2010 14:49:00 GMT
|
||||
Server: test-server/fake
|
||||
Location: this-is-the-first.html
|
||||
Content-Length: 0
|
||||
Connection: close
|
||||
</datacheck>
|
||||
</reply>
|
||||
|
||||
|
|
@ -53,7 +53,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
|
|||
|
||||
# Verify data after the test has been "shot"
|
||||
<verify>
|
||||
<protocol crlf="yes">
|
||||
<protocol crlf="headers">
|
||||
GET /%TESTNUMBER HTTP/1.1
|
||||
Host: %HOSTIP:%HTTPPORT
|
||||
Accept: */*
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue