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
85 lines
1.5 KiB
XML
85 lines
1.5 KiB
XML
<?xml version="1.0" encoding="US-ASCII"?>
|
|
<testcase>
|
|
<info>
|
|
<keywords>
|
|
HTTP
|
|
HTTP proxy
|
|
HSTS
|
|
trailing-dot
|
|
</keywords>
|
|
</info>
|
|
|
|
<reply>
|
|
|
|
# we use this as response to a CONNECT
|
|
<connect crlf="headers" nocheck="yes">
|
|
HTTP/1.1 200 OK
|
|
|
|
</connect>
|
|
<data crlf="headers">
|
|
HTTP/1.1 200 OK
|
|
Content-Length: 6
|
|
Strict-Transport-Security: max-age=604800
|
|
|
|
-foo-
|
|
</data>
|
|
<data2 crlf="headers">
|
|
HTTP/1.1 200 OK
|
|
Content-Length: 6
|
|
Strict-Transport-Security: max-age=6048000
|
|
|
|
-baa-
|
|
</data2>
|
|
</reply>
|
|
|
|
<client>
|
|
<server>
|
|
https
|
|
http-proxy
|
|
</server>
|
|
<features>
|
|
HSTS
|
|
proxy
|
|
https
|
|
Debug
|
|
</features>
|
|
<setenv>
|
|
CURL_HSTS_HTTP=yes
|
|
CURL_TIME=2000000000
|
|
</setenv>
|
|
|
|
<name>
|
|
HSTS with two URLs
|
|
</name>
|
|
<command>
|
|
-x http://%HOSTIP:%PROXYPORT --hsts %LOGDIR/hsts%TESTNUMBER http://this.hsts.example./%TESTNUMBER http://another.example.com/%TESTNUMBER0002
|
|
</command>
|
|
</client>
|
|
|
|
<verify>
|
|
# we let it CONNECT to the server to confirm HSTS but deny from there
|
|
<proxy crlf="headers">
|
|
GET http://this.hsts.example./%TESTNUMBER HTTP/1.1
|
|
Host: this.hsts.example.
|
|
User-Agent: curl/%VERSION
|
|
Accept: */*
|
|
Proxy-Connection: Keep-Alive
|
|
|
|
GET http://another.example.com/%TESTNUMBER0002 HTTP/1.1
|
|
Host: another.example.com
|
|
User-Agent: curl/%VERSION
|
|
Accept: */*
|
|
Proxy-Connection: Keep-Alive
|
|
|
|
</proxy>
|
|
|
|
<file name="%LOGDIR/hsts%TESTNUMBER" mode="text">
|
|
# Your HSTS cache. https://curl.se/docs/hsts.html
|
|
# This file was generated by libcurl! Edit at your own risk.
|
|
this.hsts.example "20330525 03:33:20"
|
|
another.example.com "20330727 03:33:20"
|
|
</file>
|
|
|
|
</verify>
|
|
</testcase>
|