mirror of
https://github.com/curl/curl.git
synced 2026-04-13 00:31:41 +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
114 lines
2.5 KiB
Plaintext
114 lines
2.5 KiB
Plaintext
<testcase>
|
|
# Authorization is used to force curl to realize that the server is
|
|
# speaking HTTP 1.0. The request must be resent with the correct
|
|
# authorization header, but using HTTP 1.0, not 1.1.
|
|
<info>
|
|
<keywords>
|
|
HTTP
|
|
HTTP PUT
|
|
HTTP Digest auth
|
|
--anyauth
|
|
HTTP/1.0
|
|
</keywords>
|
|
</info>
|
|
|
|
# Server-side
|
|
<reply>
|
|
<data crlf="headers">
|
|
HTTP/1.0 401 Authorization Required swsclose
|
|
Server: testcurl
|
|
WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
|
|
WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
|
|
WWW-Authenticate: Digest realm="gimme all yer s3cr3ts", nonce="11223344"
|
|
Content-Type: text/plain
|
|
Content-Length: 35
|
|
Connection: close
|
|
|
|
Try again on this HTTP 1.0 server!
|
|
</data>
|
|
|
|
# This is supposed to be returned when the server gets a
|
|
# Authorization: Digest line passed-in from the client
|
|
<data1000 crlf="headers">
|
|
HTTP/1.0 200 OK swsclose
|
|
Server: testcurl
|
|
Content-Type: text/plain
|
|
Content-Length: 23
|
|
Connection: close
|
|
|
|
This IS the real page!
|
|
</data1000>
|
|
|
|
<datacheck crlf="headers">
|
|
HTTP/1.0 401 Authorization Required swsclose
|
|
Server: testcurl
|
|
WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
|
|
WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
|
|
WWW-Authenticate: Digest realm="gimme all yer s3cr3ts", nonce="11223344"
|
|
Content-Type: text/plain
|
|
Content-Length: 35
|
|
Connection: close
|
|
|
|
HTTP/1.0 200 OK swsclose
|
|
Server: testcurl
|
|
Content-Type: text/plain
|
|
Content-Length: 23
|
|
Connection: close
|
|
|
|
This IS the real page!
|
|
</datacheck>
|
|
|
|
</reply>
|
|
|
|
# Client-side
|
|
<client>
|
|
<server>
|
|
http
|
|
</server>
|
|
<features>
|
|
!SSPI
|
|
crypto
|
|
digest
|
|
</features>
|
|
<name>
|
|
Downgraded HTTP PUT to HTTP 1.0 with authorization
|
|
</name>
|
|
<command>
|
|
http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/put%TESTNUMBER -u testuser:testpass --anyauth
|
|
</command>
|
|
<file name="%LOGDIR/put%TESTNUMBER">
|
|
This is data we upload with PUT
|
|
a second line
|
|
line three
|
|
four is the number of lines
|
|
</file>
|
|
</client>
|
|
|
|
# Verify data after the test has been "shot"
|
|
<verify>
|
|
<protocol crlf="headers">
|
|
PUT /%TESTNUMBER HTTP/1.1
|
|
Host: %HOSTIP:%HTTPPORT
|
|
User-Agent: curl/%VERSION
|
|
Accept: */*
|
|
Content-Length: 85
|
|
|
|
This is data we upload with PUT
|
|
a second line
|
|
line three
|
|
four is the number of lines
|
|
PUT /%TESTNUMBER HTTP/1.0
|
|
Host: %HOSTIP:%HTTPPORT
|
|
Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/%TESTNUMBER", response="df4cef6b52a30e65d472dd848d2055a1"
|
|
User-Agent: curl/%VERSION
|
|
Accept: */*
|
|
Content-Length: 85
|
|
|
|
This is data we upload with PUT
|
|
a second line
|
|
line three
|
|
four is the number of lines
|
|
</protocol>
|
|
</verify>
|
|
</testcase>
|