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
220 lines
4.6 KiB
Plaintext
220 lines
4.6 KiB
Plaintext
<testcase>
|
|
<info>
|
|
<keywords>
|
|
HTTP
|
|
HTTP POST
|
|
FORM
|
|
</keywords>
|
|
</info>
|
|
|
|
#
|
|
# Server-side
|
|
<reply>
|
|
<data crlf="headers" nocheck="yes">
|
|
HTTP/1.1 301 OK
|
|
Date: Tue, 09 Nov 2010 14:49:00 GMT
|
|
Server: test-server/fake swsclose
|
|
Connection: close
|
|
Content-Type: text/html
|
|
Location: /%TESTNUMBER0002
|
|
|
|
hello
|
|
</data>
|
|
<data2 crlf="headers">
|
|
HTTP/1.1 200 OK
|
|
Date: Tue, 09 Nov 2010 14:49:00 GMT
|
|
Server: test-server/fake
|
|
Content-Length: 6
|
|
Connection: close
|
|
Content-Type: text/html
|
|
|
|
-foo-
|
|
</data2>
|
|
</reply>
|
|
|
|
# Client-side
|
|
<client>
|
|
<features>
|
|
form-api
|
|
</features>
|
|
<server>
|
|
http
|
|
</server>
|
|
# tool is what to use instead of 'curl'
|
|
<tool>
|
|
lib%TESTNUMBER
|
|
</tool>
|
|
|
|
<name>
|
|
HTTP formpost using form API - with redirect and re-POST
|
|
</name>
|
|
<stdin>
|
|
Some data from stdin
|
|
</stdin>
|
|
<command>
|
|
http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/test%TESTNUMBER.filedata
|
|
</command>
|
|
<file name="%LOGDIR/test%TESTNUMBER.filedata">
|
|
This is data from a file.
|
|
</file>
|
|
</client>
|
|
|
|
#
|
|
# Verify data bbter the test has been "shot"
|
|
<verify>
|
|
<strippart>
|
|
s/^--------------------------[A-Za-z0-9]*/------------------------------/
|
|
s/boundary=------------------------[A-Za-z0-9]*/boundary=----------------------------/
|
|
</strippart>
|
|
# Note that the stripping above removes 12 bytes from every occurrence of the
|
|
# boundary string and since 5 of them are in the body contents, we see
|
|
# (5*12) == 60 bytes less
|
|
<protocol>
|
|
POST /%TESTNUMBER HTTP/1.1
|
|
Host: %HOSTIP:%HTTPPORT
|
|
Accept: */*
|
|
Transfer-Encoding: chunked
|
|
Content-Type: multipart/form-data; boundary=----------------------------
|
|
Expect: 100-continue
|
|
|
|
385
|
|
------------------------------
|
|
Content-Disposition: form-data; name="fieldname"
|
|
Content-Type: text/plain
|
|
X-customheader-1: Header 1 data
|
|
X-customheader-2: Header 2 data
|
|
|
|
this is what we post to the silly web server
|
|
------------------------------
|
|
Content-Disposition: form-data; name="fieldnam"
|
|
|
|
uhis is what we post to the silly web serve
|
|
------------------------------
|
|
Content-Disposition: form-data; name="multifile"
|
|
Content-Type: multipart/mixed; boundary=----------------------------
|
|
|
|
------------------------------
|
|
Content-Disposition: attachment; filename="test%TESTNUMBER.filedata"
|
|
Content-Type: application/octet-stream
|
|
|
|
This is data from a file.
|
|
|
|
------------------------------
|
|
Content-Disposition: attachment; filename="test%TESTNUMBER.filedata"
|
|
Content-Type: text/whatever
|
|
|
|
|
|
ab
|
|
This is data from a file.
|
|
|
|
------------------------------
|
|
Content-Disposition: attachment; filename="test%TESTNUMBER.filedata"
|
|
Content-Type: text/whatever
|
|
|
|
|
|
bb
|
|
This is data from a file.
|
|
|
|
--------------------------------
|
|
|
|
------------------------------
|
|
Content-Disposition: form-data; name="filecontents"
|
|
|
|
|
|
11b
|
|
This is data from a file.
|
|
|
|
------------------------------
|
|
Content-Disposition: form-data; name="formlength"
|
|
|
|
1433
|
|
------------------------------
|
|
Content-Disposition: form-data; name="standardinput"
|
|
Content-Type: application/octet-stream
|
|
|
|
|
|
16
|
|
Some data from stdin
|
|
|
|
36
|
|
|
|
--------------------------------
|
|
|
|
0
|
|
|
|
POST /%TESTNUMBER0002 HTTP/1.1
|
|
Host: %HOSTIP:%HTTPPORT
|
|
Accept: */*
|
|
Transfer-Encoding: chunked
|
|
Content-Type: multipart/form-data; boundary=----------------------------
|
|
Expect: 100-continue
|
|
|
|
385
|
|
------------------------------
|
|
Content-Disposition: form-data; name="fieldname"
|
|
Content-Type: text/plain
|
|
X-customheader-1: Header 1 data
|
|
X-customheader-2: Header 2 data
|
|
|
|
this is what we post to the silly web server
|
|
------------------------------
|
|
Content-Disposition: form-data; name="fieldnam"
|
|
|
|
uhis is what we post to the silly web serve
|
|
------------------------------
|
|
Content-Disposition: form-data; name="multifile"
|
|
Content-Type: multipart/mixed; boundary=----------------------------
|
|
|
|
------------------------------
|
|
Content-Disposition: attachment; filename="test%TESTNUMBER.filedata"
|
|
Content-Type: application/octet-stream
|
|
|
|
This is data from a file.
|
|
|
|
------------------------------
|
|
Content-Disposition: attachment; filename="test%TESTNUMBER.filedata"
|
|
Content-Type: text/whatever
|
|
|
|
|
|
ab
|
|
This is data from a file.
|
|
|
|
------------------------------
|
|
Content-Disposition: attachment; filename="test%TESTNUMBER.filedata"
|
|
Content-Type: text/whatever
|
|
|
|
|
|
bb
|
|
This is data from a file.
|
|
|
|
--------------------------------
|
|
|
|
------------------------------
|
|
Content-Disposition: form-data; name="filecontents"
|
|
|
|
|
|
11b
|
|
This is data from a file.
|
|
|
|
------------------------------
|
|
Content-Disposition: form-data; name="formlength"
|
|
|
|
1433
|
|
------------------------------
|
|
Content-Disposition: form-data; name="standardinput"
|
|
Content-Type: application/octet-stream
|
|
|
|
|
|
16
|
|
Some data from stdin
|
|
|
|
36
|
|
|
|
--------------------------------
|
|
|
|
0
|
|
|
|
</protocol>
|
|
</verify>
|
|
</testcase>
|