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
131 lines
2.7 KiB
Plaintext
131 lines
2.7 KiB
Plaintext
<testcase>
|
|
# Based on test 9
|
|
<info>
|
|
<keywords>
|
|
HTTP
|
|
HTTP FORMPOST
|
|
HTTP file upload
|
|
followlocation
|
|
</keywords>
|
|
</info>
|
|
|
|
# Server-side
|
|
<reply>
|
|
<data crlf="headers">
|
|
HTTP/1.1 307 Redirect swsclose
|
|
Date: Thu, 29 Jul 2008 14:49:00 GMT
|
|
Server: test-server/fake
|
|
Location: data/%TESTNUMBER0002.txt?coolsite=yes
|
|
Content-Length: 0
|
|
Connection: close
|
|
|
|
</data>
|
|
<data2 crlf="headers">
|
|
HTTP/1.1 200 OK swsclose
|
|
Date: Tue, 09 Nov 2010 14:49:00 GMT
|
|
Server: test-server/fake
|
|
Content-Length: 11
|
|
Connection: close
|
|
|
|
blablabla
|
|
|
|
</data2>
|
|
<datacheck crlf="headers">
|
|
HTTP/1.1 307 Redirect swsclose
|
|
Date: Thu, 29 Jul 2008 14:49:00 GMT
|
|
Server: test-server/fake
|
|
Location: data/%TESTNUMBER0002.txt?coolsite=yes
|
|
Content-Length: 0
|
|
Connection: close
|
|
|
|
HTTP/1.1 200 OK swsclose
|
|
Date: Tue, 09 Nov 2010 14:49:00 GMT
|
|
Server: test-server/fake
|
|
Content-Length: 11
|
|
Connection: close
|
|
|
|
blablabla
|
|
|
|
</datacheck>
|
|
</reply>
|
|
|
|
# Client-side
|
|
<client>
|
|
<features>
|
|
Mime
|
|
</features>
|
|
<server>
|
|
http
|
|
</server>
|
|
<name>
|
|
HTTP RFC1867-type formposting from file with Location: following
|
|
</name>
|
|
<command>
|
|
http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -L -F name=daniel -F tool=curl -F file=@%LOGDIR/test%TESTNUMBER.txt
|
|
</command>
|
|
# We create this file before the command is invoked!
|
|
<file name="%LOGDIR/test%TESTNUMBER.txt">
|
|
foo-
|
|
This is a moo-
|
|
bar
|
|
</file>
|
|
</client>
|
|
|
|
# Verify data after the test has been "shot"
|
|
<verify>
|
|
<strip>
|
|
^(Content-Type: multipart/form-data;|------------).*
|
|
</strip>
|
|
<protocol>
|
|
POST /we/want/%TESTNUMBER HTTP/1.1
|
|
Host: %HOSTIP:%HTTPPORT
|
|
User-Agent: curl/%VERSION
|
|
Accept: */*
|
|
Content-Length: 434
|
|
Content-Type: multipart/form-data; boundary=----------------------------9ef8d6205763
|
|
|
|
------------------------------9ef8d6205763
|
|
Content-Disposition: form-data; name="name"
|
|
|
|
daniel
|
|
------------------------------9ef8d6205763
|
|
Content-Disposition: form-data; name="tool"
|
|
|
|
curl
|
|
------------------------------9ef8d6205763
|
|
Content-Disposition: form-data; name="file"; filename="test%TESTNUMBER.txt"
|
|
Content-Type: text/plain
|
|
|
|
foo-
|
|
This is a moo-
|
|
bar
|
|
|
|
------------------------------9ef8d6205763--
|
|
POST /we/want/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1
|
|
Host: %HOSTIP:%HTTPPORT
|
|
User-Agent: curl/%VERSION
|
|
Accept: */*
|
|
Content-Length: 434
|
|
Content-Type: multipart/form-data; boundary=----------------------------9ef8d6205763
|
|
|
|
------------------------------9ef8d6205763
|
|
Content-Disposition: form-data; name="name"
|
|
|
|
daniel
|
|
------------------------------9ef8d6205763
|
|
Content-Disposition: form-data; name="tool"
|
|
|
|
curl
|
|
------------------------------9ef8d6205763
|
|
Content-Disposition: form-data; name="file"; filename="test%TESTNUMBER.txt"
|
|
Content-Type: text/plain
|
|
|
|
foo-
|
|
This is a moo-
|
|
bar
|
|
|
|
------------------------------9ef8d6205763--
|
|
</protocol>
|
|
</verify>
|
|
</testcase>
|