romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-26 22:44:44 +03:00
Code Issues Projects Releases Packages Wiki Activity

tests: avoid hard-coded CRLFs in more sections

Browse source 
- `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:
Viktor Szakats 2025-10-31 15:50:01 +01:00
parent 6adefe8ad0
commit 63e9721b63
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
1096 changed files with 10495 additions and 10422 deletions
Download patch file Download diff file Expand all files Collapse all files

20
tests/data/test83
View file

@ -21,9 +21,9 @@ Content-Length: 9
contents
</data>
<connect>
HTTP/1.1 200 Mighty fine indeed
<connect crlf="headers">
HTTP/1.1 200 Mighty fine indeed
</connect>
<datacheck>
HTTP/1.1 200 Mighty fine indeed
@ -60,14 +60,14 @@ proxy
#
# Verify data after the test has been "shot"
<verify>
<proxy>
CONNECT test.%TESTNUMBER:%HTTPPORT HTTP/1.1
Host: test.%TESTNUMBER:%HTTPPORT
User-Agent: curl/%VERSION
Proxy-Connection: Keep-Alive
<proxy crlf="headers">
CONNECT test.%TESTNUMBER:%HTTPPORT HTTP/1.1
Host: test.%TESTNUMBER:%HTTPPORT
User-Agent: curl/%VERSION
Proxy-Connection: Keep-Alive
</proxy>
<protocol crlf="yes">
<protocol crlf="headers">
GET /we/want/that/page/%TESTNUMBER HTTP/1.1
Host: test.%TESTNUMBER:%HTTPPORT
Authorization: Basic %b64[iam:my:;self]b64%