mirror of
https://github.com/curl/curl.git
synced 2026-04-12 00:11: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
86 lines
2.5 KiB
Plaintext
86 lines
2.5 KiB
Plaintext
<testcase>
|
|
<info>
|
|
<keywords>
|
|
header_json
|
|
</keywords>
|
|
</info>
|
|
|
|
#
|
|
# Server-side
|
|
<reply>
|
|
<data crlf="headers">
|
|
HTTP/1.1 200 OK
|
|
server: nginx
|
|
date: Tue, 07 Mar 2023 15:14:41 GMT
|
|
content-type: application/json
|
|
content-length: 6
|
|
vary: Accept-Encoding
|
|
access-control-allow-origin: *
|
|
vary: Accept-Encoding
|
|
referrer-policy: strict-origin-when-cross-origin
|
|
access-control-allow-methods: GET, POST, PUT, DELETE, OPTIONS
|
|
access-control-max-age: 1728000
|
|
access-control-allow-headers: Authorization, Content-Type, AuthorizationOauth, X-EARLY-ACCESS
|
|
access-control-expose-headers:%spc%
|
|
vary: Accept
|
|
etag: W/"2678f9ab2ba550d164e7cc014aefd31e"
|
|
cache-control: max-age=0, private, must-revalidate
|
|
x-request-id: 375b343b3d2ecf9b442c0daf00fc4a9a
|
|
strict-transport-security: max-age=31536000; includeSubDomains
|
|
x-content-type-options: nosniff
|
|
x-xss-protection: 1; mode=block
|
|
referrer-policy: strict-origin-when-cross-origin
|
|
feature-policy: accelerometer 'none'; camera 'none'; geolocation 'none'; gyroscope 'none'; magnetometer 'none'; microphone 'none'; payment 'none'; usb 'none'
|
|
|
|
-foo-
|
|
</data>
|
|
</reply>
|
|
|
|
#
|
|
# Client-side
|
|
<client>
|
|
<server>
|
|
http
|
|
</server>
|
|
<name>
|
|
HTTP GET multiple headers and %{header_json}
|
|
</name>
|
|
<command>
|
|
http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w '%{stderr}%{header_json}\n' -s
|
|
</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: */*
|
|
|
|
</protocol>
|
|
<stderr mode="text">
|
|
{"server":["nginx"],
|
|
"date":["Tue, 07 Mar 2023 15:14:41 GMT"],
|
|
"content-type":["application/json"],
|
|
"content-length":["6"],
|
|
"vary":["Accept-Encoding","Accept-Encoding","Accept"],
|
|
"access-control-allow-origin":["*"],
|
|
"referrer-policy":["strict-origin-when-cross-origin","strict-origin-when-cross-origin"],
|
|
"access-control-allow-methods":["GET, POST, PUT, DELETE, OPTIONS"],
|
|
"access-control-max-age":["1728000"],
|
|
"access-control-allow-headers":["Authorization, Content-Type, AuthorizationOauth, X-EARLY-ACCESS"],
|
|
"access-control-expose-headers":[""],
|
|
"etag":["W/\"2678f9ab2ba550d164e7cc014aefd31e\""],
|
|
"cache-control":["max-age=0, private, must-revalidate"],
|
|
"x-request-id":["375b343b3d2ecf9b442c0daf00fc4a9a"],
|
|
"strict-transport-security":["max-age=31536000; includeSubDomains"],
|
|
"x-content-type-options":["nosniff"],
|
|
"x-xss-protection":["1; mode=block"],
|
|
"feature-policy":["accelerometer 'none'; camera 'none'; geolocation 'none'; gyroscope 'none'; magnetometer 'none'; microphone 'none'; payment 'none'; usb 'none'"]
|
|
}
|
|
</stderr>
|
|
</verify>
|
|
</testcase>
|