mirror of
https://github.com/curl/curl.git
synced 2026-04-13 12:41: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
88 lines
1.9 KiB
Plaintext
88 lines
1.9 KiB
Plaintext
<testcase>
|
|
<info>
|
|
<keywords>
|
|
FTP
|
|
HTTPS proxy
|
|
flaky
|
|
</keywords>
|
|
</info>
|
|
|
|
# Server-side
|
|
<reply>
|
|
|
|
# This is the HTTPS proxy response
|
|
<connect crlf="headers">
|
|
HTTP/1.1 200 OK
|
|
Date: Tue, 09 Nov 2010 14:49:00 GMT
|
|
Server: test-server/fake
|
|
Content-Type: text/html
|
|
Funny-head: yesyes
|
|
Content-Length: 0
|
|
|
|
</connect>
|
|
|
|
# This is the FTP server response. The Life and Adventures of Robinson Crusoe
|
|
<data>
|
|
I was born in the year 1632, in the city of York, of a good family, though not
|
|
of that country, myfather being a foreigner of Bremen, who settled first at
|
|
Hull. He got a good estate by merchandise,and leaving off his trade, lived
|
|
afterwards at York, from whence he had married my mother, whoserelations were
|
|
named Robinson, a very good family in that country, and from whom I was
|
|
calledRobinson Kreutznaer; but, by the usual corruption of words in England,
|
|
we are now called-nay wecall ourselves and write our name-Crusoe; and so my
|
|
companions always called me.
|
|
</data>
|
|
</reply>
|
|
|
|
# Client-side
|
|
<client>
|
|
<server>
|
|
ftp
|
|
https-proxy
|
|
</server>
|
|
<name>
|
|
FTP through HTTPS-proxy
|
|
</name>
|
|
<command>
|
|
-p -x https://%HOSTIP:%HTTPSPROXYPORT ftp://ftp.site.thru.https.proxy:%FTPPORT/%TESTNUMBER --proxy-insecure
|
|
</command>
|
|
<features>
|
|
http
|
|
proxy
|
|
</features>
|
|
</client>
|
|
|
|
# Verify data after the test has been "shot"
|
|
<verify>
|
|
|
|
# The second CONNECT will be made to the dynamic port number the FTP server
|
|
# opens for us, so we can't compare with a known pre-existing number!
|
|
<strippart>
|
|
s/((https.proxy):(\d+))/$2:12345/
|
|
s/^(User-Agent: curl).*/$1/
|
|
</strippart>
|
|
<proxy crlf="headers">
|
|
CONNECT ftp.site.thru.https.proxy:12345 HTTP/1.1
|
|
Host: ftp.site.thru.https.proxy:12345
|
|
User-Agent: curl
|
|
Proxy-Connection: Keep-Alive
|
|
|
|
CONNECT ftp.site.thru.https.proxy:12345 HTTP/1.1
|
|
Host: ftp.site.thru.https.proxy:12345
|
|
User-Agent: curl
|
|
Proxy-Connection: Keep-Alive
|
|
|
|
</proxy>
|
|
<protocol crlf="yes">
|
|
USER anonymous
|
|
PASS ftp@example.com
|
|
PWD
|
|
EPSV
|
|
TYPE I
|
|
SIZE %TESTNUMBER
|
|
RETR %TESTNUMBER
|
|
QUIT
|
|
</protocol>
|
|
</verify>
|
|
</testcase>
|