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
108 lines
3.0 KiB
Plaintext
108 lines
3.0 KiB
Plaintext
<testcase>
|
|
<info>
|
|
<keywords>
|
|
HTTPS
|
|
HTTP
|
|
HTTP GET
|
|
cookies
|
|
cookiejar
|
|
HTTP replaced headers
|
|
</keywords>
|
|
</info>
|
|
|
|
# Server-side
|
|
<reply>
|
|
<data1>
|
|
HTTP/1.1 200 OK
|
|
Date: Tue, 09 Nov 2010 14:49:00 GMT
|
|
Server: test-server/fake
|
|
Set-Cookie: super=secret; domain=example.com; path=/%TESTNUMBER; secure;
|
|
Set-Cookie: supersuper=secret; domain=example.com; path=/%TESTNUMBER/login/; secure;
|
|
Set-Cookie: __Secure-SID=12345; Domain=example.com
|
|
Set-Cookie: __SecURE-SID=12346; Secure; Domain=example.com
|
|
Set-Cookie: supersupersuper=secret; __Secure-SID=12346; Secure; Domain=example.com
|
|
Set-Cookie: __Host-SID=22345
|
|
Set-Cookie: __Host-SID=22346; Secure
|
|
Set-Cookie: __Host-SID=22347; Domain=example.com
|
|
Set-Cookie: __Host-SID=22348; Domain=example.com; Path=/
|
|
Set-Cookie: __Host-SID=22349; Secure; Domain=example.com; Path=/
|
|
Set-Cookie: __Host-SID=12346; Secure; Path=/
|
|
Content-Length: 7
|
|
|
|
nomnom
|
|
</data1>
|
|
<data2>
|
|
HTTP/1.1 200 OK
|
|
Date: Tue, 09 Nov 2010 14:49:00 GMT
|
|
Server: test-server/fake
|
|
Set-Cookie: super=plain; domain=example.com; path=/%TESTNUMBER; httponly;
|
|
Set-Cookie: super=plain; domain=example.com; path=/%TESTNUMBER/; httponly;
|
|
Set-Cookie: super=plain; domain=example.com; path=/15; httponly;
|
|
Set-Cookie: public=yes; domain=example.com; path=/foo;
|
|
Set-Cookie: supersuper=plain; domain=example.com; path=/%TESTNUMBER/login/en;
|
|
Set-Cookie: supersuper=plain; domain=example.com; path=/%TESTNUMBER/login;
|
|
Set-Cookie: secureoverhttp=yes; domain=example.com; path=/%TESTNUMBER; secure;
|
|
Set-Cookie: __Secure-SID=22345; Domain=example.com
|
|
Set-Cookie: __SecuRE-SID=22346; Secure; Domain=example.com
|
|
Set-Cookie: __Host-SID=32345
|
|
Set-Cookie: __Host-SID=32346; Secure
|
|
Set-Cookie: __Host-SID=32347; Domain=example.com
|
|
Set-Cookie: __Host-SID=32348; Domain=example.com; Path=/
|
|
Set-Cookie: __Host-SID=32349; Secure; Domain=example.com; Path=/
|
|
Set-Cookie: __Host-SID=32350; Secure; Path=/
|
|
Content-Length: 7
|
|
|
|
nomnom
|
|
</data2>
|
|
</reply>
|
|
|
|
# Client-side
|
|
<client>
|
|
<features>
|
|
SSL
|
|
</features>
|
|
<server>
|
|
http
|
|
https
|
|
</server>
|
|
<killserver>
|
|
https
|
|
</killserver>
|
|
<name>
|
|
Cookies set over HTTP can't override secure ones
|
|
</name>
|
|
<command>
|
|
--insecure https://%HOSTIP:%HTTPSPORT/%TESTNUMBER0001 -L -c %LOGDIR/jar%TESTNUMBER.txt -H "Host: www.example.com" http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002 -L -c %LOGDIR/jar%TESTNUMBER.txt -H "Host: www.example.com"
|
|
</command>
|
|
</client>
|
|
<verify>
|
|
<protocol crlf="headers">
|
|
GET /%TESTNUMBER0001 HTTP/1.1
|
|
Host: www.example.com
|
|
User-Agent: curl/%VERSION
|
|
Accept: */*
|
|
|
|
GET /%TESTNUMBER0002 HTTP/1.1
|
|
Host: www.example.com
|
|
User-Agent: curl/%VERSION
|
|
Accept: */*
|
|
|
|
</protocol>
|
|
<file name="%LOGDIR/jar%TESTNUMBER.txt" mode="text">
|
|
# Netscape HTTP Cookie File
|
|
# https://curl.se/docs/http-cookies.html
|
|
# This file was generated by libcurl! Edit at your own risk.
|
|
|
|
.example.com TRUE /foo FALSE 0 public yes
|
|
#HttpOnly_.example.com TRUE /15 FALSE 0 super plain
|
|
www.example.com FALSE / TRUE 0 __Host-SID 12346
|
|
.example.com TRUE / TRUE 0 supersupersuper secret
|
|
.example.com TRUE / TRUE 0 __SecURE-SID 12346
|
|
.example.com TRUE /%TESTNUMBER/login/ TRUE 0 supersuper secret
|
|
.example.com TRUE /1561 TRUE 0 super secret
|
|
</file>
|
|
|
|
</verify>
|
|
|
|
</testcase>
|