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
95 lines
1.8 KiB
Plaintext
95 lines
1.8 KiB
Plaintext
<testcase>
|
|
<info>
|
|
<keywords>
|
|
HTTP
|
|
HTTP GET
|
|
Alt-Svc
|
|
HTTP/2
|
|
</keywords>
|
|
</info>
|
|
|
|
#
|
|
# Server-side
|
|
<reply>
|
|
<data crlf="headers" nocheck="yes">
|
|
HTTP/1.1 200 OK
|
|
Date: Tue, 09 Nov 2010 14:49:00 GMT
|
|
Content-Length: 6
|
|
Connection: close
|
|
Content-Type: text/html
|
|
Funny-head: yesyes
|
|
Alt-Svc: h2=":%HTTP2PORT", ma=315360000; persist=0
|
|
|
|
-foo-
|
|
</data>
|
|
</reply>
|
|
|
|
#
|
|
# Client-side
|
|
<client>
|
|
<features>
|
|
alt-svc
|
|
Debug
|
|
h2c
|
|
</features>
|
|
<server>
|
|
http
|
|
http/2
|
|
</server>
|
|
<name>
|
|
HTTPS GET translated by alt-svc lookup to HTTP/2 GET
|
|
</name>
|
|
<setenv>
|
|
# make Debug-curl accept Alt-Svc over plain HTTP
|
|
CURL_ALTSVC_HTTP="yeah"
|
|
</setenv>
|
|
<command>
|
|
--http2 --alt-svc "%LOGDIR/altsvc-%TESTNUMBER" "http://%HOSTIP:%HTTPPORT/%TESTNUMBER" "http://%HOSTIP:%HTTPPORT/%TESTNUMBER"
|
|
</command>
|
|
<file name="%LOGDIR/altsvc-%TESTNUMBER">
|
|
h2 %HOSTIP %HTTPPORT h2 %HOSTIP %HTTP2PORT "20290222 22:19:28" 0 0
|
|
</file>
|
|
|
|
</client>
|
|
|
|
#
|
|
# Verify data after the test has been "shot"
|
|
<verify>
|
|
<stdout crlf="headers">
|
|
HTTP/1.1 101 Switching Protocols
|
|
Connection: Upgrade
|
|
Upgrade: h2c
|
|
|
|
HTTP/2 200%spc%
|
|
date: Tue, 09 Nov 2010 14:49:00 GMT
|
|
content-length: 6
|
|
content-type: text/html
|
|
funny-head: yesyes
|
|
alt-svc: h2=":%HTTP2PORT", ma=315360000; persist=0
|
|
via: 1.1 nghttpx
|
|
|
|
-foo-
|
|
HTTP/2 200%spc%
|
|
date: Tue, 09 Nov 2010 14:49:00 GMT
|
|
content-length: 6
|
|
content-type: text/html
|
|
funny-head: yesyes
|
|
alt-svc: h2=":%HTTP2PORT", ma=315360000; persist=0
|
|
via: 1.1 nghttpx
|
|
|
|
-foo-
|
|
</stdout>
|
|
<stripfile>
|
|
s/^server: nghttpx.*\r?\n//
|
|
# strip out the (dynamic) expire date from the file so that the rest
|
|
# matches
|
|
s/\"2([^\"]*)\"/TIMESTAMP/
|
|
</stripfile>
|
|
<file name="%LOGDIR/altsvc-%TESTNUMBER" mode="text">
|
|
# Your alt-svc cache. https://curl.se/docs/alt-svc.html
|
|
# This file was generated by libcurl! Edit at your own risk.
|
|
h2 %HOSTIP %HTTPPORT h2 %HOSTIP %HTTP2PORT TIMESTAMP 0 0
|
|
</file>
|
|
</verify>
|
|
</testcase>
|