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
124 lines
2.7 KiB
Plaintext
124 lines
2.7 KiB
Plaintext
<testcase>
|
|
<info>
|
|
<keywords>
|
|
HTTP
|
|
HTTP PUT
|
|
HTTP proxy
|
|
HTTP Digest auth
|
|
Resume
|
|
Content-Range
|
|
CUSTOMREQUEST
|
|
</keywords>
|
|
</info>
|
|
|
|
<reply>
|
|
<data crlf="headers">
|
|
HTTP/1.1 100 Continue
|
|
Server: Microsoft-IIS/5.0
|
|
Date: Sun, 03 Apr 2005 14:57:45 GMT
|
|
X-Powered-By: ASP.NET
|
|
|
|
HTTP/1.1 401 authentication please
|
|
Server: Microsoft-IIS/6.0
|
|
WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
|
|
Content-Type: text/html; charset=iso-8859-1
|
|
Content-Length: 0
|
|
|
|
</data>
|
|
<data1000 crlf="headers">
|
|
HTTP/1.1 200 A OK
|
|
Server: Microsoft-IIS/6.0
|
|
Content-Type: text/html; charset=iso-8859-1
|
|
Content-Length: 3
|
|
|
|
ok
|
|
</data1000>
|
|
|
|
<datacheck crlf="headers">
|
|
HTTP/1.1 100 Continue
|
|
Server: Microsoft-IIS/5.0
|
|
Date: Sun, 03 Apr 2005 14:57:45 GMT
|
|
X-Powered-By: ASP.NET
|
|
|
|
HTTP/1.1 401 authentication please
|
|
Server: Microsoft-IIS/6.0
|
|
WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
|
|
Content-Type: text/html; charset=iso-8859-1
|
|
Content-Length: 0
|
|
|
|
HTTP/1.1 200 A OK
|
|
Server: Microsoft-IIS/6.0
|
|
Content-Type: text/html; charset=iso-8859-1
|
|
Content-Length: 3
|
|
|
|
ok
|
|
</datacheck>
|
|
|
|
</reply>
|
|
|
|
# Client-side
|
|
<client>
|
|
#
|
|
<server>
|
|
http
|
|
</server>
|
|
<features>
|
|
!SSPI
|
|
crypto
|
|
proxy
|
|
digest
|
|
</features>
|
|
<name>
|
|
HTTP PUT with Digest auth, resumed upload and modified method, twice
|
|
</name>
|
|
<command>
|
|
http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload1 -T %LOGDIR/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload2 -T %LOGDIR/%TESTNUMBER -u auser:apasswd --digest -x http://%HOSTIP:%HTTPPORT -C 2 -X GET
|
|
</command>
|
|
<file name="%LOGDIR/%TESTNUMBER">
|
|
test
|
|
</file>
|
|
</client>
|
|
|
|
# Verify data after the test has been "shot"
|
|
<verify>
|
|
<protocol crlf="headers">
|
|
GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload1 HTTP/1.1
|
|
Host: %HOSTIP:%HTTPPORT
|
|
Content-Range: bytes 2-4/5
|
|
User-Agent: curl/%VERSION
|
|
Accept: */*
|
|
Proxy-Connection: Keep-Alive
|
|
Content-Length: 0
|
|
|
|
GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload1 HTTP/1.1
|
|
Host: %HOSTIP:%HTTPPORT
|
|
Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER.upload1", response="198aa9b6acb4b0c71d02a197a5e41f54"
|
|
Content-Range: bytes 2-4/5
|
|
User-Agent: curl/%VERSION
|
|
Accept: */*
|
|
Proxy-Connection: Keep-Alive
|
|
Content-Length: 3
|
|
|
|
st
|
|
GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload2 HTTP/1.1
|
|
Host: %HOSTIP:%HTTPPORT
|
|
Content-Range: bytes 2-4/5
|
|
User-Agent: curl/%VERSION
|
|
Accept: */*
|
|
Proxy-Connection: Keep-Alive
|
|
Content-Length: 0
|
|
|
|
GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload2 HTTP/1.1
|
|
Host: %HOSTIP:%HTTPPORT
|
|
Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER.upload2", response="d711f0d2042786d930de635ba0d1a1d0"
|
|
Content-Range: bytes 2-4/5
|
|
User-Agent: curl/%VERSION
|
|
Accept: */*
|
|
Proxy-Connection: Keep-Alive
|
|
Content-Length: 3
|
|
|
|
st
|
|
</protocol>
|
|
</verify>
|
|
</testcase>
|