← Commit list

6cf3d7b1b1

Viktor Szakats
Viktor Szakats
2025-11-01
SUCCESS Duration: 286s

Subject

tests: avoid more hard-coded CRLFs in `protocol` sections

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

docs/tests/FILEFORMAT.md +5 -1tests/data/test10 +7 -7tests/data/test1001 +18 -18tests/data/test1002 +35 -35tests/data/test1008 +18 -18tests/data/test1030 +14 -14tests/data/test1041 +8 -8tests/data/test1050 +8 -8tests/data/test1051 +13 -13tests/data/test1052 +13 -13tests/data/test1064 +13 -13tests/data/test1065 +12 -12tests/data/test1071 +14 -14tests/data/test1075 +14 -14tests/data/test1098 +13 -13tests/data/test1134 +13 -13tests/data/test116 +7 -7tests/data/test1206 +9 -9tests/data/test1207 +9 -9tests/data/test1208 +8 -8tests/data/test1209 +8 -8tests/data/test1211 +8 -8tests/data/test125 +6 -6tests/data/test1285 +14 -14tests/data/test1414 +10 -10tests/data/test1418 +23 -23tests/data/test1419 +11 -11tests/data/test1421 +13 -13tests/data/test1509 +5 -5tests/data/test1524 +12 -12tests/data/test1525 +7 -7tests/data/test1526 +7 -7tests/data/test1527 +8 -8tests/data/test154 +14 -14tests/data/test155 +21 -21tests/data/test156 +7 -7tests/data/test1590 +0 -2tests/data/test1671 +6 -6tests/data/test18 +16 -16tests/data/test180 +7 -7tests/data/test181 +8 -8tests/data/test1938 +7 -7tests/data/test194 +7 -7tests/data/test1948 +12 -12tests/data/test1973 +8 -8tests/data/test2000 +9 -9tests/data/test2001 +14 -14tests/data/test2058 +18 -18tests/data/test2059 +18 -18tests/data/test206 +17 -17tests/data/test2060 +18 -18tests/data/test212 +15 -15tests/data/test253 +8 -8tests/data/test255 +8 -8tests/data/test272 +6 -6tests/data/test275 +13 -13tests/data/test281 +7 -7tests/data/test32 +6 -6tests/data/test33 +8 -8tests/data/test338 +11 -11tests/data/test35 +8 -8tests/data/test357 +14 -14tests/data/test364 +7 -7tests/data/test384 +8 -8tests/data/test388 +29 -29tests/data/test425 +7 -7tests/data/test48 +11 -11tests/data/test490 +13 -13tests/data/test491 +7 -7tests/data/test492 +29 -29tests/data/test503 +6 -6tests/data/test508 +7 -7tests/data/test513 +0 -2tests/data/test540 +23 -23tests/data/test544 +7 -7tests/data/test545 +7 -7tests/data/test547 +24 -24tests/data/test548 +24 -24tests/data/test551 +16 -16tests/data/test553 +15 -15tests/data/test555 +24 -24tests/data/test568 +18 -18tests/data/test572 +25 -25tests/data/test577 +6 -6tests/data/test58 +7 -7tests/data/test582 +0 -2tests/data/test588 +10 -10tests/data/test591 +10 -10tests/data/test592 +10 -10tests/data/test593 +10 -10tests/data/test594 +10 -10tests/data/test596 +9 -9tests/data/test758 +0 -2tests/data/test766 +6 -6tests/data/test785 +8 -8tests/data/test786 +8 -8tests/data/test88 +14 -14tests/data/test95 +8 -8tests/data/test97 +8 -8tests/data/test970 +6 -6tests/data/test972 +6 -6tests/data/test977 +7 -7tests/data/test98 +8 -8tests/data/test985 +2 -2tests/data/test986 +3 -3tests/runtests.pl +4 -1tests/testutil.pm +2 -1
docs/tests/FILEFORMAT.md+5 -1
@@ -663,7 +663,7 @@ command exists with a non-zero status code, the test is considered failed.
A list of directory entries that are checked for after the test has completed
and that must not exist. A listed entry existing causes the test to fail.
-### `<protocol [nonewline="yes"][crlf="yes"]>`
+### `<protocol [nonewline="yes"][crlf="yes|headers"]>`
the protocol dump curl should transmit, if `nonewline` is set, we cut off the
trailing newline of this given data before comparing with the one actually
@@ -673,6 +673,10 @@ comparisons are made.
`crlf=yes` forces the newlines to become CRLF even if not written so in the
test.
+`crlf=headers` forces *header* newlines to become CRLF even if not written so
+in the source file. Note that this makes runtests.pl parse and "guess" what is
+a header and what is not in order to apply the CRLF line endings appropriately.
+
### `<proxy [nonewline="yes"][crlf="yes"]>`
The protocol dump curl should transmit to an HTTP proxy (when the http-proxy
tests/data/test10+7 -7
@@ -43,13 +43,13 @@ the
# Verify data after the test has been "shot"
<verify>
-<protocol>
-PUT /we/want/%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 78
-
+<protocol crlf="headers">
+PUT /we/want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 78
+
Weird
file
to
tests/data/test1001+18 -18
@@ -82,24 +82,24 @@ test
# Verify data after the test has been "shot"
<verify>
-<protocol>
-GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER 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 HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="6af4d89c952f4dd4cc215a6878dc499d"
-Content-Range: bytes 2-4/5
-User-Agent: curl/%VERSION
-Accept: */*
-Proxy-Connection: Keep-Alive
-Content-Length: 3
-
+<protocol crlf="headers">
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER 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 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="6af4d89c952f4dd4cc215a6878dc499d"
+Content-Range: bytes 2-4/5
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+Content-Length: 3
+
st
</protocol>
</verify>
tests/data/test1002+35 -35
@@ -81,42 +81,42 @@ test
# Verify data after the test has been "shot"
<verify>
-<protocol>
-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
-
+<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
-
+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>
tests/data/test1008+18 -18
@@ -101,24 +101,24 @@ http://test.remote.example.com.%TESTNUMBER:%HTTPPORT/path/%TESTNUMBER0002 --prox
# Verify data after the test has been "shot"
<verify>
-<protocol>
-CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
-Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
-Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-User-Agent: curl/%VERSION
-Proxy-Connection: Keep-Alive
-
-CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
-Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
-Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
-User-Agent: curl/%VERSION
-Proxy-Connection: Keep-Alive
-
-GET /path/%TESTNUMBER0002 HTTP/1.1
-Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-
+<protocol crlf="headers">
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
+Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+User-Agent: curl/%VERSION
+Proxy-Connection: Keep-Alive
+
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
+Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+User-Agent: curl/%VERSION
+Proxy-Connection: Keep-Alive
+
+GET /path/%TESTNUMBER0002 HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
[DISCONNECT]
</protocol>
</verify>
tests/data/test1030+14 -14
@@ -80,24 +80,24 @@ four is the number of lines
# Verify data after the test has been "shot"
<verify>
-<protocol>
-PUT /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 85
-
+<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.1
-Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/%TESTNUMBER", response="01cb59db1ddaac246b072d5f5f0716d9"
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 85
-
+PUT /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/%TESTNUMBER", response="01cb59db1ddaac246b072d5f5f0716d9"
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 85
+
This is data we upload with PUT
a second line
line three
tests/data/test1041+8 -8
@@ -52,14 +52,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T%LOGDIR/test%TESTNUMBER.txt -C -
<verify>
# curl doesn't do a HEAD request on the remote file so it has no idea whether
# it can skip part of the file or not. Instead, it sends the entire file.
-<protocol>
-PUT /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Content-Range: bytes 0-99/100
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 100
-
+<protocol crlf="headers">
+PUT /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Content-Range: bytes 0-99/100
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 100
+
012345678
012345678
012345678
tests/data/test1050+8 -8
@@ -46,16 +46,16 @@ FTP-IPv6 dir list, EPRT with specified IP
<verify>
# Strip all valid kinds of EPRT that curl can send
<strippart>
-s/^(EPRT \|2\|::1\|)(.*)/$1/
+s/^(EPRT \|2\|::1\|)(\S*)/$1/
</strippart>
-<protocol>
-USER anonymous
-PASS [email protected]
-PWD
+<protocol crlf="yes">
+USER anonymous
+PASS [email protected]
+PWD
EPRT |2|::1|
-TYPE A
-LIST
-QUIT
+TYPE A
+LIST
+QUIT
</protocol>
</verify>
</testcase>
tests/data/test1051+13 -13
@@ -79,13 +79,13 @@ the
# including the full request-body before it responds. So in this test the
# server says 301 and 100 _after_ the entire PUT body has been sent.
-<protocol>
-PUT /want/%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 78
-
+<protocol crlf="headers">
+PUT /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 78
+
Weird
file
to
@@ -95,12 +95,12 @@ for
the
PUT
feature
-PUT /want/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 78
-
+PUT /want/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 78
+
Weird
file
to
tests/data/test1052+13 -13
@@ -74,13 +74,13 @@ the
# the test HTTP server is blocking until it has read the entire request,
# including the full request-body before it responds. So in this test the
# server says 301 and 200 _after_ the entire PUT body has been sent.
-<protocol>
-PUT /want/%TESTNUMBER HTTP/1.0
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 78
-
+<protocol crlf="headers">
+PUT /want/%TESTNUMBER HTTP/1.0
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 78
+
Weird
file
to
@@ -90,12 +90,12 @@ for
the
PUT
feature
-PUT /want/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.0
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 78
-
+PUT /want/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.0
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 78
+
Weird
file
to
tests/data/test1064+13 -13
@@ -44,20 +44,20 @@ test
# Verify data after the test has been "shot"
<verify>
-<protocol>
-PUT /%TESTNUMBER.upload1 HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 5
-
+<protocol crlf="headers">
+PUT /%TESTNUMBER.upload1 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 5
+
test
-PUT /%TESTNUMBER0002.upload2 HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 5
-
+PUT /%TESTNUMBER0002.upload2 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 5
+
test
</protocol>
<stdout>
tests/data/test1065+12 -12
@@ -45,19 +45,19 @@ test
# Verify data after the test has been "shot"
<verify>
-<protocol>
-PUT /%TESTNUMBER.upload1 HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 5
-
+<protocol crlf="headers">
+PUT /%TESTNUMBER.upload1 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 5
+
test
-GET /%TESTNUMBER0002.url2 HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-
+GET /%TESTNUMBER0002.url2 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
</protocol>
<stdout>
HTTP/1.1 200 A OK
tests/data/test1071+14 -14
@@ -86,24 +86,24 @@ four is the number of lines
# Verify data after the test has been "shot"
<verify>
-<protocol>
-PUT /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 85
-
+<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
-
+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
tests/data/test1075+14 -14
@@ -64,24 +64,24 @@ four is the number of lines
# Verify data after the test has been "shot"
<verify>
-<protocol>
-PUT /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 85
-
+<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.1
-Host: %HOSTIP:%HTTPPORT
-Authorization: Basic %b64[testuser:testpass]b64%
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 85
-
+PUT /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[testuser:testpass]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 85
+
This is data we upload with PUT
a second line
line three
tests/data/test1098+13 -13
@@ -43,19 +43,19 @@ ftp://ftp-site/moo/%TESTNUMBER ftp://ftp-site/moo/%TESTNUMBER --proxy http://%HO
#
# Verify data after the test has been "shot"
<verify>
-<protocol>
-GET ftp://ftp-site/moo/%TESTNUMBER HTTP/1.1
-Host: ftp-site:21
-User-Agent: curl/%VERSION
-Accept: */*
-Proxy-Connection: Keep-Alive
-
-GET ftp://ftp-site/moo/%TESTNUMBER HTTP/1.1
-Host: ftp-site:21
-User-Agent: curl/%VERSION
-Accept: */*
-Proxy-Connection: Keep-Alive
-
+<protocol crlf="yes">
+GET ftp://ftp-site/moo/%TESTNUMBER HTTP/1.1
+Host: ftp-site:21
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET ftp://ftp-site/moo/%TESTNUMBER HTTP/1.1
+Host: ftp-site:21
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
</protocol>
<stdout>
HTTP/1.1 200 OK
tests/data/test1134+13 -13
@@ -45,19 +45,19 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u user1:password1 --next http://%HOSTIP:%H
#
# Verify data after the test has been "shot"
<verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Authorization: Basic %b64[user1:password1]b64%
-User-Agent: curl/%VERSION
-Accept: */*
-
-GET /%TESTNUMBER0001 HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Authorization: Basic %b64[2user:password2]b64%
-User-Agent: curl/%VERSION
-Accept: */*
-
+<protocol crlf="headers">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[user1:password1]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[2user:password2]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
[DISCONNECT]
</protocol>
</verify>
tests/data/test116+7 -7
@@ -43,13 +43,13 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P 1.2.3.4
s/^(PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},)\d{1,3},\d{1,3}/$1/
s/^(EPRT \|1\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\|)\d{1,5}\|/$1/
</strippart>
-<protocol>
-USER anonymous
-PASS [email protected]
-PWD
-EPRT |1|1.2.3.4|
-PORT 1,2,3,4,
-QUIT
+<protocol crlf="yes">
+USER anonymous
+PASS [email protected]
+PWD
+EPRT |1|1.2.3.4|
+PORT 1,2,3,4,
+QUIT
</protocol>
</verify>
</testcase>
tests/data/test1206+9 -9
@@ -34,17 +34,17 @@ FTP PORT and 425 on download
# Verify data after the test has been "shot"
<verify>
<strippart>
-s/^EPRT \|1\|(.*)/EPRT \|1\|/
+s/^EPRT \|1\|(\S*)/EPRT \|1\|/
</strippart>
-<protocol>
-USER anonymous
-PASS [email protected]
-PWD
+<protocol crlf="yes">
+USER anonymous
+PASS [email protected]
+PWD
EPRT |1|
-TYPE I
-SIZE %TESTNUMBER
-RETR %TESTNUMBER
-QUIT
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
</protocol>
10 is CURLE_FTP_ACCEPT_FAILED
<errorcode>
tests/data/test1207+9 -9
@@ -34,17 +34,17 @@ FTP PORT and 421 on download
# Verify data after the test has been "shot"
<verify>
<strippart>
-s/^EPRT \|1\|(.*)/EPRT \|1\|/
+s/^EPRT \|1\|(\S*)/EPRT \|1\|/
</strippart>
-<protocol>
-USER anonymous
-PASS [email protected]
-PWD
+<protocol crlf="yes">
+USER anonymous
+PASS [email protected]
+PWD
EPRT |1|
-TYPE I
-SIZE %TESTNUMBER
-RETR %TESTNUMBER
-QUIT
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
</protocol>
<errorcode>
10
tests/data/test1208+8 -8
@@ -38,21 +38,21 @@ FTP PORT download, no data conn and no transient negative reply
# Verify data after the test has been "shot"
<verify>
<strippart>
-s/^EPRT \|1\|(.*)/EPRT \|1\|/
+s/^EPRT \|1\|(\S*)/EPRT \|1\|/
</strippart>
# This test doesn't send a QUIT because the main state machine in multi.c
# triggers the timeout and sets the CURLE_OPERATION_TIMEDOUT error (28) for
# which the FTP disconnect code generically has to assume could mean the
# control the connection and thus it cannot send any command.
-<protocol>
-USER anonymous
-PASS [email protected]
-PWD
+<protocol crlf="yes">
+USER anonymous
+PASS [email protected]
+PWD
EPRT |1|
-TYPE I
-SIZE %TESTNUMBER
-RETR %TESTNUMBER
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
</protocol>
# 28 is CURLE_OPERATION_TIMEDOUT
<errorcode>
tests/data/test1209+8 -8
@@ -36,7 +36,7 @@ FTP PORT download, no data conn and no positive preliminary reply
# Verify data after the test has been "shot"
<verify>
<strippart>
-s/^EPRT \|1\|(.*)/EPRT \|1\|/
+s/^EPRT \|1\|(\S*)/EPRT \|1\|/
</strippart>
# The protocol part does not include QUIT simply because the error is
@@ -44,14 +44,14 @@ s/^EPRT \|1\|(.*)/EPRT \|1\|/
# specifically saying for which connection it concerns, and for timeouts libcurl
# marks the control channel as "invalid". As this test case times out for the
# data connection it could still use the control channel.
-<protocol>
-USER anonymous
-PASS [email protected]
-PWD
+<protocol crlf="yes">
+USER anonymous
+PASS [email protected]
+PWD
EPRT |1|
-TYPE I
-SIZE %TESTNUMBER
-RETR %TESTNUMBER
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
</protocol>
<errorcode>
28
tests/data/test1211+8 -8
@@ -36,17 +36,17 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P -
# Verify data after the test has been "shot"
<verify>
<strippart>
-s/^EPRT \|1\|(.*)/EPRT \|1\|/
+s/^EPRT \|1\|(\S*)/EPRT \|1\|/
</strippart>
-<protocol>
-USER anonymous
-PASS [email protected]
-PWD
+<protocol crlf="yes">
+USER anonymous
+PASS [email protected]
+PWD
EPRT |1|
-TYPE I
-SIZE %TESTNUMBER
-RETR %TESTNUMBER
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
</protocol>
<errorcode>
28
tests/data/test125+6 -6
@@ -30,12 +30,12 @@ ftp://%HOSTIP:%FTPPORT/path/to/file/%TESTNUMBER
<errorcode>
9
</errorcode>
-<protocol>
-USER anonymous
-PASS [email protected]
-PWD
-CWD path
-QUIT
+<protocol crlf="yes">
+USER anonymous
+PASS [email protected]
+PWD
+CWD path
+QUIT
</protocol>
</verify>
</testcase>
tests/data/test1285+14 -14
@@ -73,20 +73,20 @@ four is the number of lines
# Verify data after the test has been "shot"
<verify>
-<protocol>
-PUT /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 0
-
-PUT /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="dc185587d5e8391b347eef194c2a3cd6"
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 85
-
+<protocol crlf="headers">
+PUT /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 0
+
+PUT /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="dc185587d5e8391b347eef194c2a3cd6"
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 85
+
This is data we upload with PUT
a second line
line three
tests/data/test1414+10 -10
@@ -39,19 +39,19 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P -
# Verify data after the test has been "shot"
<verify>
<strippart>
-s/^(EPRT \|1\|)(.*)/$1/
-s/^(PORT)(.*)/$1/
+s/^(EPRT \|1\|)(\S*)/$1/
+s/^(PORT) *(\S*)/$1/
</strippart>
-<protocol>
-USER anonymous
-PASS [email protected]
-PWD
+<protocol crlf="yes">
+USER anonymous
+PASS [email protected]
+PWD
EPRT |1|
PORT
-TYPE I
-SIZE %TESTNUMBER
-RETR %TESTNUMBER
-QUIT
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
</protocol>
</verify>
</testcase>
tests/data/test1418+23 -23
@@ -94,29 +94,29 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth http://%HOST
# Verify data after the test has been "shot"
<verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-
-GET /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="loonie", nonce="314156592", uri="/%TESTNUMBER", response="986238b7e0077754944c966f56d9bc77"
-User-Agent: curl/%VERSION
-Accept: */*
-
-GET /%TESTNUMBER0003 HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-
-GET /%TESTNUMBER0003 HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="loonie", nonce="314156592", uri="/%TESTNUMBER0003", response="1c6390a67bac3283a9b023402f3b3540"
-User-Agent: curl/%VERSION
-Accept: */*
-
+<protocol crlf="headers">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="loonie", nonce="314156592", uri="/%TESTNUMBER", response="986238b7e0077754944c966f56d9bc77"
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0003 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0003 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="loonie", nonce="314156592", uri="/%TESTNUMBER0003", response="1c6390a67bac3283a9b023402f3b3540"
+User-Agent: curl/%VERSION
+Accept: */*
+
[DISCONNECT]
</protocol>
</verify>
tests/data/test1419+11 -11
@@ -51,17 +51,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --anyauth http://%HOSTIP:%HTTPPORT/%TESTNUM
# Verify data after the test has been "shot"
<verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-
-GET /%TESTNUMBER0003 HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-
+<protocol crlf="headers">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0003 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
[DISCONNECT]
</protocol>
</verify>
tests/data/test1421+13 -13
@@ -55,19 +55,19 @@ Content-Length: 6
-foo-
</stdout>
-<protocol>
-GET http://test.remote.haxx.se.%TESTNUMBER:8990/ HTTP/1.1
-Host: test.remote.haxx.se.%TESTNUMBER:8990
-User-Agent: curl/%VERSION
-Accept: */*
-Proxy-Connection: Keep-Alive
-
-GET http://different.remote.haxx.se.%TESTNUMBER:8990/ HTTP/1.1
-Host: different.remote.haxx.se.%TESTNUMBER:8990
-User-Agent: curl/%VERSION
-Accept: */*
-Proxy-Connection: Keep-Alive
-
+<protocol crlf="headers">
+GET http://test.remote.haxx.se.%TESTNUMBER:8990/ HTTP/1.1
+Host: test.remote.haxx.se.%TESTNUMBER:8990
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://different.remote.haxx.se.%TESTNUMBER:8990/ HTTP/1.1
+Host: different.remote.haxx.se.%TESTNUMBER:8990
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
[DISCONNECT]
</protocol>
</verify>
tests/data/test1509+5 -5
@@ -80,11 +80,11 @@ Proxy-Connection: Keep-Alive
[DISCONNECT]
</proxy>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1
-Host: the.old.moo.%TESTNUMBER:%HTTPPORT
-Accept: */*
-
+<protocol crlf="headers">
+GET /%TESTNUMBER HTTP/1.1
+Host: the.old.moo.%TESTNUMBER:%HTTPPORT
+Accept: */*
+
[DISCONNECT]
</protocol>
</verify>
tests/data/test1524+12 -12
@@ -55,19 +55,19 @@ moo
#
# Verify data after the test has been "shot"
<verify>
-<protocol nonewline="yes">
-PUT /blah/%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 4
-
+<protocol crlf="headers" nonewline="yes">
+PUT /blah/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 4
+
moo
-GET /blah/moo.html&testcase=/%TESTNUMBER0002 HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-
+GET /blah/moo.html&testcase=/%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
</protocol>
</verify>
tests/data/test1525+7 -7
@@ -65,13 +65,13 @@ Proxy-Connection: Keep-Alive
User-Agent: Http Agent
</proxy>
-<protocol>
-PUT /%TESTNUMBER HTTP/1.1
-Host: the.old.moo.%TESTNUMBER:%HTTPPORT
-Accept: */*
-User-Agent: Http Agent
-Content-Length: 13
-
+<protocol crlf="headers">
+PUT /%TESTNUMBER HTTP/1.1
+Host: the.old.moo.%TESTNUMBER:%HTTPPORT
+Accept: */*
+User-Agent: Http Agent
+Content-Length: 13
+
Hello Cloud!
</protocol>
</verify>
tests/data/test1526+7 -7
@@ -67,13 +67,13 @@ Proxy-Connection: Keep-Alive
User-Agent: Proxy Agent
</proxy>
-<protocol>
-PUT /%TESTNUMBER HTTP/1.1
-Host: the.old.moo.%TESTNUMBER:%HTTPPORT
-Accept: */*
-User-Agent: Http Agent
-Content-Length: 13
-
+<protocol crlf="headers">
+PUT /%TESTNUMBER HTTP/1.1
+Host: the.old.moo.%TESTNUMBER:%HTTPPORT
+Accept: */*
+User-Agent: Http Agent
+Content-Length: 13
+
Hello Cloud!
</protocol>
</verify>
tests/data/test1527+8 -8
@@ -67,14 +67,14 @@ User-Agent: Http Agent
Expect: 100-continue
</proxy>
-<protocol>
-PUT /%TESTNUMBER HTTP/1.1
-Host: the.old.moo.%TESTNUMBER:%HTTPPORT
-Accept: */*
-User-Agent: Http Agent
-Expect: 100-continue
-Content-Length: 13
-
+<protocol crlf="headers">
+PUT /%TESTNUMBER HTTP/1.1
+Host: the.old.moo.%TESTNUMBER:%HTTPPORT
+Accept: */*
+User-Agent: Http Agent
+Expect: 100-continue
+Content-Length: 13
+
Hello Cloud!
</protocol>
</verify>
tests/data/test154+14 -14
@@ -80,24 +80,24 @@ four is the number of lines
# Verify data after the test has been "shot"
<verify>
-<protocol>
-PUT /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 85
-
+<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.1
-Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/%TESTNUMBER", response="b71551e12d1c456e47d8388ecb2edeca"
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 85
-
+PUT /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/%TESTNUMBER", response="b71551e12d1c456e47d8388ecb2edeca"
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 85
+
This is data we upload with PUT
a second line
line three
tests/data/test155+21 -21
@@ -96,31 +96,31 @@ four is the number of lines
# Verify data after the test has been "shot"
<verify>
-<protocol>
-PUT /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 85
-
+<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.1
-Host: %HOSTIP:%HTTPPORT
-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 0
-
-PUT /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 85
-
+PUT /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 0
+
+PUT /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 85
+
This is data we upload with PUT
a second line
line three
tests/data/test156+7 -7
@@ -40,13 +40,13 @@ four is the number of lines
# Verify data after the test has been "shot"
<verify>
-<protocol>
-PUT /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 85
-
+<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
tests/data/test1590+0 -2
@@ -51,7 +51,5 @@ imap://localhost:%IMAPPORT/%TESTNUMBER
#
# Verify data after the test has been "shot"
<verify>
-<protocol>
-</protocol>
</verify>
</testcase>
tests/data/test1671+6 -6
@@ -50,12 +50,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w '%{header_json}\n' -o %LOGDIR/%TESTNUMBE
#
# Verify data after the test has been "shot"
<verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
</protocol>
<stdout mode="text">
{"date":["Tue, 09 Nov 2010 14:49:00 GMT"],
tests/data/test18+16 -16
@@ -47,22 +47,22 @@ multiple requests using {} in URL
# Verify data after the test has been "shot"
<verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-
-GET /%TESTNUMBER0002 HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-
-GET /%TESTNUMBER0003 HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0003 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
</protocol>
<stdout>
HTTP/1.1 200 OK
tests/data/test180+7 -7
@@ -44,13 +44,13 @@ the
# Verify data after the test has been "shot"
<verify>
-<protocol>
-PUT /we/want/%TESTNUMBER HTTP/1.0
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 78
-
+<protocol crlf="headers">
+PUT /we/want/%TESTNUMBER HTTP/1.0
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 78
+
Weird
file
to
tests/data/test181+8 -8
@@ -44,14 +44,14 @@ the
# Verify data after the test has been "shot"
<verify>
-<protocol>
-POST /we/want/%TESTNUMBER HTTP/1.0
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 79
-Content-Type: application/x-www-form-urlencoded
-
+<protocol crlf="headers">
+POST /we/want/%TESTNUMBER HTTP/1.0
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 79
+Content-Type: application/x-www-form-urlencoded
+
Weird
file
to
tests/data/test1938+7 -7
@@ -60,13 +60,13 @@ http://127.0.0.1:9000/%TESTNUMBER/testapi/test 127.0.0.1:9000:%HOSTIP:%HTTPPORT
^Content-Type:.*
^Accept:.*
</strip>
-<protocol nonewline="yes">
-POST /%TESTNUMBER/testapi/test HTTP/1.1
-Host: 127.0.0.1:9000
-Authorization: PROVIDER14-HMAC-SHA256 Credential=keyId/19700101/region/service/provider14_request, SignedHeaders=content-type;host;x-provider2-date, Signature=3436256c7c23adeb66dc15984eaa527edc4a504def61da2e0bf4b01ace4f3c0b
-X-Provider2-Date: 19700101T000000Z
-Content-Length: 9
-
+<protocol crlf="headers" nonewline="yes">
+POST /%TESTNUMBER/testapi/test HTTP/1.1
+Host: 127.0.0.1:9000
+Authorization: PROVIDER14-HMAC-SHA256 Credential=keyId/19700101/region/service/provider14_request, SignedHeaders=content-type;host;x-provider2-date, Signature=3436256c7c23adeb66dc15984eaa527edc4a504def61da2e0bf4b01ace4f3c0b
+X-Provider2-Date: 19700101T000000Z
+Content-Length: 9
+
%hex[post%00Data]hex%
</protocol>
</verify>
tests/data/test194+7 -7
@@ -56,13 +56,13 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -C 87 --fail
# Verify data after the test has been "shot"
<verify>
-<protocol>
-GET /want/%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Range: bytes=87-
-User-Agent: curl/%VERSION
-Accept: */*
-
+<protocol crlf="yes">
+GET /want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Range: bytes=87-
+User-Agent: curl/%VERSION
+Accept: */*
+
</protocol>
<errorcode>
0
tests/data/test1948+12 -12
@@ -53,19 +53,19 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
# Verify data after the test has been "shot"
<verify>
-<protocol>
-PUT /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Accept: */*
-Content-Length: 22
-
+<protocol crlf="headers">
+PUT /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 22
+
This is test PUT data
-POST /1948 HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Accept: */*
-Content-Length: 22
-Content-Type: application/x-www-form-urlencoded
-
+POST /1948 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 22
+Content-Type: application/x-www-form-urlencoded
+
This is test PUT data
</protocol>
</verify>
tests/data/test1973+8 -8
@@ -59,14 +59,14 @@ http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPP
^Content-Type:.*
^Accept:.*
</strip>
-<protocol>
-POST /aws_sigv4/testapi/test HTTP/1.1
-Host: exam.ple.com:9000
-Authorization: AWS4-HMAC-SHA256 Credential=xxx/19700101/us-east-1/s3/aws4_request, SignedHeaders=content-type;host;x-amz-content-sha256;x-amz-date, Signature=7eb34202214384872221b99a9c671b7517891ac6af56b0aff24ec51adf62b10a
-X-Amz-Date: 19700101T000000Z
-x-amz-content-sha256: 4b02e333ccf7cf530ddee3e10ebe54e935500b5e570e68650d63d743e8bbc045
-Content-Length: 12
-
+<protocol crlf="headers">
+POST /aws_sigv4/testapi/test HTTP/1.1
+Host: exam.ple.com:9000
+Authorization: AWS4-HMAC-SHA256 Credential=xxx/19700101/us-east-1/s3/aws4_request, SignedHeaders=content-type;host;x-amz-content-sha256;x-amz-date, Signature=7eb34202214384872221b99a9c671b7517891ac6af56b0aff24ec51adf62b10a
+X-Amz-Date: 19700101T000000Z
+x-amz-content-sha256: 4b02e333ccf7cf530ddee3e10ebe54e935500b5e570e68650d63d743e8bbc045
+Content-Length: 12
+
post fields
</protocol>
</verify>
tests/data/test2000+9 -9
@@ -46,15 +46,15 @@ moo
#
# Verify data after the test has been "shot"
<verify>
-<protocol>
-USER anonymous
-PASS [email protected]
-PWD
-EPSV
-TYPE I
-SIZE %TESTNUMBER
-RETR %TESTNUMBER
-QUIT
+<protocol crlf="yes">
+USER anonymous
+PASS [email protected]
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
</protocol>
<stdout>
data
tests/data/test2001+14 -14
@@ -63,20 +63,20 @@ moo
#
# Verify data after the test has been "shot"
<verify>
-<protocol>
-GET /%TESTNUMBER0001 HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-
-USER anonymous
-PASS [email protected]
-PWD
-EPSV
-TYPE I
-SIZE %TESTNUMBER0002
-RETR %TESTNUMBER0002
-QUIT
+<protocol crlf="yes">
+GET /%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+USER anonymous
+PASS [email protected]
+PWD
+EPSV
+TYPE I
+SIZE %TESTNUMBER0002
+RETR %TESTNUMBER0002
+QUIT
</protocol>
<stdout>
-foo-
tests/data/test2058+18 -18
@@ -82,24 +82,24 @@ test
# Verify data after the test has been "shot"
<verify>
-<protocol>
-GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER 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 HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="fbed69f9f3fd304c8f1acb1a43eb32688b933c0e28055c16b926cbcec070aeed", algorithm=SHA-256
-Content-Range: bytes 2-4/5
-User-Agent: curl/%VERSION
-Accept: */*
-Proxy-Connection: Keep-Alive
-Content-Length: 3
-
+<protocol crlf="headers">
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER 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 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="fbed69f9f3fd304c8f1acb1a43eb32688b933c0e28055c16b926cbcec070aeed", algorithm=SHA-256
+Content-Range: bytes 2-4/5
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+Content-Length: 3
+
st
</protocol>
</verify>
tests/data/test2059+18 -18
@@ -82,24 +82,24 @@ test
# Verify data after the test has been "shot"
<verify>
-<protocol>
-GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER 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 HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="fddc3bc7b753b73ab0848fd83cb20cbbca971258eb8d20c941dd5e0b010d66be", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="22d200df1fd02a9d3a7269ef5bbb5bf8f16f184a74907df9b64a3755489c0b42", algorithm=SHA-256, userhash=true
-Content-Range: bytes 2-4/5
-User-Agent: curl/%VERSION
-Accept: */*
-Proxy-Connection: Keep-Alive
-Content-Length: 3
-
+<protocol crlf="headers">
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER 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 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="fddc3bc7b753b73ab0848fd83cb20cbbca971258eb8d20c941dd5e0b010d66be", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="22d200df1fd02a9d3a7269ef5bbb5bf8f16f184a74907df9b64a3755489c0b42", algorithm=SHA-256, userhash=true
+Content-Range: bytes 2-4/5
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+Content-Length: 3
+
st
</protocol>
</verify>
tests/data/test206+17 -17
@@ -86,23 +86,23 @@ http://test.remote.haxx.se.%TESTNUMBER:8990/path/%TESTNUMBER0002 --proxy=http://
# Verify data after the test has been "shot"
<verify>
-<protocol>
-CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1
-Host: test.remote.haxx.se.%TESTNUMBER:8990
-User-Agent: curl/%VERSION
-Proxy-Connection: Keep-Alive
-
-CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1
-Host: test.remote.haxx.se.%TESTNUMBER:8990
-Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.%TESTNUMBER:8990", response="003e36decb4dbf6366b3ecb9b87c24ec"
-User-Agent: curl/%VERSION
-Proxy-Connection: Keep-Alive
-
-GET /path/%TESTNUMBER0002 HTTP/1.1
-Host: test.remote.haxx.se.%TESTNUMBER:8990
-User-Agent: curl/%VERSION
-Accept: */*
-
+<protocol crlf="headers">
+CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1
+Host: test.remote.haxx.se.%TESTNUMBER:8990
+User-Agent: curl/%VERSION
+Proxy-Connection: Keep-Alive
+
+CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1
+Host: test.remote.haxx.se.%TESTNUMBER:8990
+Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.%TESTNUMBER:8990", response="003e36decb4dbf6366b3ecb9b87c24ec"
+User-Agent: curl/%VERSION
+Proxy-Connection: Keep-Alive
+
+GET /path/%TESTNUMBER0002 HTTP/1.1
+Host: test.remote.haxx.se.%TESTNUMBER:8990
+User-Agent: curl/%VERSION
+Accept: */*
+
[DISCONNECT]
</protocol>
</verify>
tests/data/test2060+18 -18
@@ -82,24 +82,24 @@ test
# Verify data after the test has been "shot"
<verify>
-<protocol>
-GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER 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 HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="691867f4a06c79fd0a175c1857e3df7015f6fff3ce8676497d2f1f805b5a8eca", algorithm=SHA-512-256
-Content-Range: bytes 2-4/5
-User-Agent: curl/%VERSION
-Accept: */*
-Proxy-Connection: Keep-Alive
-Content-Length: 3
-
+<protocol crlf="headers">
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER 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 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="691867f4a06c79fd0a175c1857e3df7015f6fff3ce8676497d2f1f805b5a8eca", algorithm=SHA-512-256
+Content-Range: bytes 2-4/5
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+Content-Length: 3
+
st
</protocol>
</verify>
tests/data/test212+15 -15
@@ -44,21 +44,21 @@ data blobb
s/^(EPRT \|1\|)\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\|\d{1,5}\|/$1/
s/^(PORT )\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}/$1/
</strippart>
-<protocol>
-USER anonymous
-PASS [email protected]
-PWD
-CWD a
-CWD path
-EPRT |1|
-PORT
-TYPE I
-SIZE %TESTNUMBER
-RETR %TESTNUMBER
-PORT
-SIZE %TESTNUMBER
-RETR %TESTNUMBER
-QUIT
+<protocol crlf="yes">
+USER anonymous
+PASS [email protected]
+PWD
+CWD a
+CWD path
+EPRT |1|
+PORT%spc%
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+PORT%spc%
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
</protocol>
</verify>
</testcase>
tests/data/test253+8 -8
@@ -46,16 +46,16 @@ FTP IPv6 dir list with EPRT
# Verify data after the test has been "shot"
<verify>
<strippart>
-s/^(EPRT \|2\|::1\|)(.*)/$1/
+s/^(EPRT \|2\|::1\|)(\S*)/$1/
</strippart>
-<protocol>
-USER anonymous
-PASS [email protected]
-PWD
+<protocol crlf="yes">
+USER anonymous
+PASS [email protected]
+PWD
EPRT |2|::1|
-TYPE A
-LIST
-QUIT
+TYPE A
+LIST
+QUIT
</protocol>
</verify>
</testcase>
tests/data/test255+8 -8
@@ -47,16 +47,16 @@ FTP IPv6 dir list with EPRT and --disable-eprt
# Verify data after the test has been "shot"
<verify>
<strippart>
-s/^(EPRT \|2\|::1\|)(.*)/$1/
+s/^(EPRT \|2\|::1\|)(\S*)/$1/
</strippart>
-<protocol>
-USER anonymous
-PASS [email protected]
-PWD
+<protocol crlf="yes">
+USER anonymous
+PASS [email protected]
+PWD
EPRT |2|::1|
-TYPE A
-LIST
-QUIT
+TYPE A
+LIST
+QUIT
</protocol>
</verify>
</testcase>
tests/data/test272+6 -6
@@ -29,12 +29,12 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -z "2004 jan 1 12:12:12 UTC"
# Verify data after the test has been "shot"
<verify>
-<protocol>
-USER anonymous
-PASS [email protected]
-PWD
-MDTM %TESTNUMBER
-QUIT
+<protocol crlf="yes">
+USER anonymous
+PASS [email protected]
+PWD
+MDTM %TESTNUMBER
+QUIT
</protocol>
</verify>
</testcase>
tests/data/test275+13 -13
@@ -72,19 +72,19 @@ User-Agent: curl/%VERSION
Proxy-Connection: Keep-Alive
</proxy>
-<protocol>
-GET /we/want/that/page/%TESTNUMBER HTTP/1.1
-Host: remotesite.com.%TESTNUMBER:%HTTPPORT
-Authorization: Basic %b64[iam:myself]b64%
-User-Agent: curl/%VERSION
-Accept: */*
-
-GET /we/want/that/page/%TESTNUMBER HTTP/1.1
-Host: remotesite.com.%TESTNUMBER:%HTTPPORT
-Authorization: Basic %b64[iam:myself]b64%
-User-Agent: curl/%VERSION
-Accept: */*
-
+<protocol crlf="yes">
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: remotesite.com.%TESTNUMBER:%HTTPPORT
+Authorization: Basic %b64[iam:myself]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: remotesite.com.%TESTNUMBER:%HTTPPORT
+Authorization: Basic %b64[iam:myself]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
</protocol>
</verify>
</testcase>
tests/data/test281+7 -7
@@ -43,13 +43,13 @@ Weird
<errorcode>
22
</errorcode>
-<protocol>
-PUT /we/want/%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 38
-
+<protocol crlf="headers">
+PUT /we/want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 38
+
Weird
file
to
tests/data/test32+6 -6
@@ -42,12 +42,12 @@ HTTP with -d and -G
#
# Verify data after the test has been "shot"
<verify>
-<protocol>
-GET /%TESTNUMBER?foo=moo&moo=poo HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-
+<protocol crlf="yes">
+GET /%TESTNUMBER?foo=moo&moo=poo HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
</protocol>
</verify>
</testcase>
tests/data/test33+8 -8
@@ -42,14 +42,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T%LOGDIR/test%TESTNUMBER.txt -C 50
# Verify data after the test has been "shot"
<verify>
-<protocol>
-PUT /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Content-Range: bytes 50-99/100
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 50
-
+<protocol crlf="headers">
+PUT /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Content-Range: bytes 50-99/100
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 50
+
012345678
012345678
012345678
tests/data/test338+11 -11
@@ -45,17 +45,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --next http://%HOSTIP:%HTTPPORT/%TESTNUMBER
#
# Verify data after the test has been "shot"
<verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-
-GET /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-
+<protocol crlf="headers">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
[DISCONNECT]
</protocol>
</verify>
tests/data/test35+8 -8
@@ -35,14 +35,14 @@ http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --data-binary @%LOGDIR/test%TESTNUM
# Verify data after the test has been "shot"
<verify>
-<protocol>
-POST /we/want/%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 47
-Content-Type: application/x-www-form-urlencoded
-
+<protocol crlf="headers">
+POST /we/want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 47
+Content-Type: application/x-www-form-urlencoded
+
%hex[This%00 is binary data with an embedded NUL byte]hex%
</protocol>
</verify>
tests/data/test357+14 -14
@@ -61,20 +61,20 @@ http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt --ex
# Verify data after the test has been "shot"
<verify>
-<protocol>
-PUT /we/want/%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 1053701
-Expect: 100-continue
-
-PUT /we/want/%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 1053701
-
+<protocol crlf="headers">
+PUT /we/want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 1053701
+Expect: 100-continue
+
+PUT /we/want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 1053701
+
%repeat[1053700 x x]%
</protocol>
</verify>
tests/data/test364+7 -7
@@ -37,13 +37,13 @@ HTTPS PUT of small file
# Verify data after the test has been "shot"
<verify>
-<protocol>
-PUT /we/want/%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPSPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 1201
-
+<protocol crlf="headers">
+PUT /we/want/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPSPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 1201
+
%repeat[200 x banana]%
</protocol>
</verify>
tests/data/test384+8 -8
@@ -45,14 +45,14 @@ HTTP with --json from stdin
#
# Verify data after the test has been "shot"
<verify>
-<protocol>
-POST /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: foobar/*
-Content-Type: application/json
-Content-Length: 22
-
+<protocol crlf="headers">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: foobar/*
+Content-Type: application/json
+Content-Length: 22
+
{ "drink": "coffee" }
</protocol>
</verify>
tests/data/test388+29 -29
@@ -91,35 +91,35 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -u testuser:testpass --digest http://%H
<strip>
^Authorization.*cnonce
</strip>
-<protocol>
-GET /%TESTNUMBER0001 HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-
-GET /%TESTNUMBER0001 HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER0001", response="ea598bbfdb5c54b7352c977e3885e44d"
-User-Agent: curl/%VERSION
-Accept: */*
-
-GET /%TESTNUMBER0002 HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-
-GET /%TESTNUMBER0002 HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER0002", response="921a8e6db782d6359db1f40d9ed7e6a6"
-User-Agent: curl/%VERSION
-Accept: */*
-
-GET /%TESTNUMBER0002 HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="999999", uri="/%TESTNUMBER0002", cnonce="MTA4MzIr", nc="00000001", qop="auth", response="25291c357671604a16c0242f56721c07", algorithm=MD5
-User-Agent: curl/%VERSION
-Accept: */*
-
+<protocol crlf="yes">
+GET /%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER0001", response="ea598bbfdb5c54b7352c977e3885e44d"
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER0002", response="921a8e6db782d6359db1f40d9ed7e6a6"
+User-Agent: curl/%VERSION
+Accept: */*
+
+GET /%TESTNUMBER0002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="999999", uri="/%TESTNUMBER0002", cnonce="MTA4MzIr", nc="00000001", qop="auth", response="25291c357671604a16c0242f56721c07", algorithm=MD5
+User-Agent: curl/%VERSION
+Accept: */*
+
</protocol>
<stdout>
HTTP/1.1 401 Authorization Required swsclose
tests/data/test425+7 -7
@@ -40,13 +40,13 @@ content
#
# Verify data after the test has been "shot"
<verify>
-<protocol>
-PUT /%TESTNUMBER/?fullpath HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 8
-
+<protocol crlf="headers">
+PUT /%TESTNUMBER/?fullpath HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 8
+
content
</protocol>
</verify>
tests/data/test48+11 -11
@@ -36,17 +36,17 @@ HTTP with -d and -G and -I
#
# Verify data after the test has been "shot"
<verify>
-<protocol>
-HEAD /%TESTNUMBER?foo=moo&moo=poo HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-
-HEAD /%TESTNUMBER?foo=moo&moo=poo HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-
+<protocol crlf="headers">
+HEAD /%TESTNUMBER?foo=moo&moo=poo HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+HEAD /%TESTNUMBER?foo=moo&moo=poo HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
[DISCONNECT]
</protocol>
</verify>
tests/data/test490+13 -13
@@ -45,20 +45,20 @@ surprise!
#
# Verify data after the test has been "shot"
<verify>
-<protocol>
-PUT /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 10
-
+<protocol crlf="headers">
+PUT /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 10
+
surprise!
-PUT /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 10
-
+PUT /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 10
+
surprise!
</protocol>
</verify>
tests/data/test491+7 -7
@@ -45,13 +45,13 @@ surprise!
#
# Verify data after the test has been "shot"
<verify>
-<protocol>
-PUT /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 10
-
+<protocol crlf="headers">
+PUT /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 10
+
surprise!
</protocol>
<errorcode>
tests/data/test492+29 -29
@@ -48,38 +48,38 @@ second %TESTNUMBER contents
#
# Verify data after the test has been "shot"
<verify>
-<protocol>
-PUT /one/first%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Testno: %TESTNUMBER
-Content-Length: 19
-
+<protocol crlf="headers">
+PUT /one/first%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Testno: %TESTNUMBER
+Content-Length: 19
+
first %TESTNUMBER contents
-PUT /two/first%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Testno: %TESTNUMBER
-Content-Length: 19
-
+PUT /two/first%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Testno: %TESTNUMBER
+Content-Length: 19
+
first %TESTNUMBER contents
-PUT /one/second%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Testno: %TESTNUMBER
-Content-Length: 20
-
+PUT /one/second%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Testno: %TESTNUMBER
+Content-Length: 20
+
second %TESTNUMBER contents
-PUT /two/second%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Testno: %TESTNUMBER
-Content-Length: 20
-
+PUT /two/second%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Testno: %TESTNUMBER
+Content-Length: 20
+
second %TESTNUMBER contents
</protocol>
</verify>
tests/data/test503+6 -6
@@ -78,12 +78,12 @@ Proxy-Connection: Keep-Alive
[DISCONNECT]
</proxy>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1
-Host: machine.%TESTNUMBER:%HTTPPORT
-Authorization: Basic %b64[test:ing]b64%
-Accept: */*
-
+<protocol crlf="headers">
+GET /%TESTNUMBER HTTP/1.1
+Host: machine.%TESTNUMBER:%HTTPPORT
+Authorization: Basic %b64[test:ing]b64%
+Accept: */*
+
[DISCONNECT]
</protocol>
</verify>
tests/data/test508+7 -7
@@ -41,13 +41,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
#
# Verify data after the test has been "shot"
<verify>
-<protocol>
-POST /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Accept: */*
-Content-Length: 45
-Content-Type: application/x-www-form-urlencoded
-
+<protocol crlf="headers">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 45
+Content-Type: application/x-www-form-urlencoded
+
this is what we post to the silly web server
</protocol>
</verify>
tests/data/test513+0 -2
@@ -33,8 +33,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
#
# Verify data after the test has been "shot"
<verify>
-<protocol>
-</protocol>
# 42 - aborted by callback
<errorcode>
42
tests/data/test540+23 -23
@@ -80,29 +80,29 @@ http://test.remote.example.com/path/%TESTNUMBER http://%HOSTIP:%HTTPPORT silly:p
# Verify data after the test has been "shot"
<verify>
-<protocol>
-GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
-Host: custom.set.host.name
-Accept: */*
-Proxy-Connection: Keep-Alive
-
-GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
-Host: custom.set.host.name
-Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="/path/%TESTNUMBER", response="ca507dcf189196b6a5374d3233042261"
-Accept: */*
-Proxy-Connection: Keep-Alive
-
-GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
-Host: custom.set.host.name
-Accept: */*
-Proxy-Connection: Keep-Alive
-
-GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
-Host: custom.set.host.name
-Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="/path/%TESTNUMBER", response="ca507dcf189196b6a5374d3233042261"
-Accept: */*
-Proxy-Connection: Keep-Alive
-
+<protocol crlf="headers">
+GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
+Host: custom.set.host.name
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
+Host: custom.set.host.name
+Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="/path/%TESTNUMBER", response="ca507dcf189196b6a5374d3233042261"
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
+Host: custom.set.host.name
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
+Host: custom.set.host.name
+Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="/path/%TESTNUMBER", response="ca507dcf189196b6a5374d3233042261"
+Accept: */*
+Proxy-Connection: Keep-Alive
+
[DISCONNECT]
</protocol>
</verify>
tests/data/test544+7 -7
@@ -40,13 +40,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
#
# Verify data after the test has been "shot"
<verify>
-<protocol nonewline="yes">
-POST /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Accept: */*
-Content-Length: 4
-Content-Type: application/x-www-form-urlencoded
-
+<protocol crlf="headers" nonewline="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 4
+Content-Type: application/x-www-form-urlencoded
+
This
</protocol>
</verify>
tests/data/test545+7 -7
@@ -43,13 +43,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
<strip>
^User-Agent:.*
</strip>
-<protocol nonewline="yes">
-POST /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Accept: */*
-Content-Length: 46
-Content-Type: application/x-www-form-urlencoded
-
+<protocol crlf="headers" nonewline="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 46
+Content-Type: application/x-www-form-urlencoded
+
%hex[This%00 is test binary data with an embedded NUL]hex%
</protocol>
</verify>
tests/data/test547+24 -24
@@ -91,31 +91,31 @@ http://test.remote.example.com/path/%TESTNUMBER http://%HOSTIP:%HTTPPORT testuse
# Verify data after the test has been "shot"
<verify>
-<protocol>
-POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
-Host: test.remote.example.com
-Accept: */*
-Proxy-Connection: Keep-Alive
-Content-Length: 36
-Content-Type: application/x-www-form-urlencoded
-
+<protocol crlf="headers">
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
+Host: test.remote.example.com
+Accept: */*
+Proxy-Connection: Keep-Alive
+Content-Length: 36
+Content-Type: application/x-www-form-urlencoded
+
this is the blurb we want to upload
-POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
-Host: test.remote.example.com
-Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-Accept: */*
-Proxy-Connection: Keep-Alive
-Content-Length: 0
-Content-Type: application/x-www-form-urlencoded
-
-POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
-Host: test.remote.example.com
-Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
-Accept: */*
-Proxy-Connection: Keep-Alive
-Content-Length: 36
-Content-Type: application/x-www-form-urlencoded
-
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
+Host: test.remote.example.com
+Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+Accept: */*
+Proxy-Connection: Keep-Alive
+Content-Length: 0
+Content-Type: application/x-www-form-urlencoded
+
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
+Host: test.remote.example.com
+Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+Accept: */*
+Proxy-Connection: Keep-Alive
+Content-Length: 36
+Content-Type: application/x-www-form-urlencoded
+
this is the blurb we want to upload
</protocol>
</verify>
tests/data/test548+24 -24
@@ -91,31 +91,31 @@ http://test.remote.example.com/path/%TESTNUMBER http://%HOSTIP:%HTTPPORT testuse
# Verify data after the test has been "shot"
<verify>
-<protocol>
-POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
-Host: test.remote.example.com
-Accept: */*
-Proxy-Connection: Keep-Alive
-Content-Length: 36
-Content-Type: application/x-www-form-urlencoded
-
+<protocol crlf="headers">
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
+Host: test.remote.example.com
+Accept: */*
+Proxy-Connection: Keep-Alive
+Content-Length: 36
+Content-Type: application/x-www-form-urlencoded
+
this is the blurb we want to upload
-POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
-Host: test.remote.example.com
-Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-Accept: */*
-Proxy-Connection: Keep-Alive
-Content-Length: 0
-Content-Type: application/x-www-form-urlencoded
-
-POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
-Host: test.remote.example.com
-Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
-Accept: */*
-Proxy-Connection: Keep-Alive
-Content-Length: 36
-Content-Type: application/x-www-form-urlencoded
-
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
+Host: test.remote.example.com
+Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+Accept: */*
+Proxy-Connection: Keep-Alive
+Content-Length: 0
+Content-Type: application/x-www-form-urlencoded
+
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
+Host: test.remote.example.com
+Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+Accept: */*
+Proxy-Connection: Keep-Alive
+Content-Length: 36
+Content-Type: application/x-www-form-urlencoded
+
this is the blurb we want to upload
</protocol>
</verify>
tests/data/test551+16 -16
@@ -76,23 +76,23 @@ http://test.remote.example.com/path/%TESTNUMBER http://%HOSTIP:%HTTPPORT s1lly:p
# Verify data after the test has been "shot"
<verify>
-<protocol>
-POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
-Host: test.remote.example.com
-Accept: */*
-Proxy-Connection: Keep-Alive
-Content-Length: 36
-Content-Type: application/x-www-form-urlencoded
-
+<protocol crlf="headers">
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
+Host: test.remote.example.com
+Accept: */*
+Proxy-Connection: Keep-Alive
+Content-Length: 36
+Content-Type: application/x-www-form-urlencoded
+
this is the blurb we want to upload
-POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
-Host: test.remote.example.com
-Proxy-Authorization: Digest username="s1lly", realm="something fun to read", nonce="%repeat[400 x A]%", uri="/path/%TESTNUMBER", response="3325240726fbdaf1e61f3a0dd40b930c"
-Accept: */*
-Proxy-Connection: Keep-Alive
-Content-Length: 36
-Content-Type: application/x-www-form-urlencoded
-
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
+Host: test.remote.example.com
+Proxy-Authorization: Digest username="s1lly", realm="something fun to read", nonce="%repeat[400 x A]%", uri="/path/%TESTNUMBER", response="3325240726fbdaf1e61f3a0dd40b930c"
+Accept: */*
+Proxy-Connection: Keep-Alive
+Content-Length: 36
+Content-Type: application/x-www-form-urlencoded
+
this is the blurb we want to upload
</protocol>
</verify>
tests/data/test553+15 -15
@@ -41,21 +41,21 @@ http://%HOSTIP:%HTTPPORT/path/%TESTNUMBER
# Verify data after the test has been "shot"
<verify>
-<protocol nonewline="yes">
-POST /path/%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Accept: */*
-Header0: %repeat[5000 x A]%
-Header1: %repeat[5000 x A]%
-Header2: %repeat[5000 x A]%
-Header3: %repeat[5000 x A]%
-Header4: %repeat[5000 x A]%
-Header5: %repeat[5000 x A]%
-Header6: %repeat[5000 x A]%
-Header7: %repeat[5000 x A]%
-Content-Length: 40960
-Content-Type: application/x-www-form-urlencoded
-
+<protocol crlf="headers" nonewline="yes">
+POST /path/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Header0: %repeat[5000 x A]%
+Header1: %repeat[5000 x A]%
+Header2: %repeat[5000 x A]%
+Header3: %repeat[5000 x A]%
+Header4: %repeat[5000 x A]%
+Header5: %repeat[5000 x A]%
+Header6: %repeat[5000 x A]%
+Header7: %repeat[5000 x A]%
+Content-Length: 40960
+Content-Type: application/x-www-form-urlencoded
+
%repeat[40960 x A]%
</protocol>
</verify>
tests/data/test555+24 -24
@@ -96,31 +96,31 @@ http://test.remote.example.com/path/%TESTNUMBER http://%HOSTIP:%HTTPPORT testuse
# Verify data after the test has been "shot"
<verify>
-<protocol>
-POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
-Host: test.remote.example.com
-Accept: */*
-Proxy-Connection: Keep-Alive
-Content-Length: 36
-Content-Type: application/x-www-form-urlencoded
-
+<protocol crlf="headers">
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
+Host: test.remote.example.com
+Accept: */*
+Proxy-Connection: Keep-Alive
+Content-Length: 36
+Content-Type: application/x-www-form-urlencoded
+
this is the blurb we want to upload
-POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
-Host: test.remote.example.com
-Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-Accept: */*
-Proxy-Connection: Keep-Alive
-Content-Length: 0
-Content-Type: application/x-www-form-urlencoded
-
-POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
-Host: test.remote.example.com
-Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
-Accept: */*
-Proxy-Connection: Keep-Alive
-Content-Length: 36
-Content-Type: application/x-www-form-urlencoded
-
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
+Host: test.remote.example.com
+Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+Accept: */*
+Proxy-Connection: Keep-Alive
+Content-Length: 0
+Content-Type: application/x-www-form-urlencoded
+
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
+Host: test.remote.example.com
+Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+Accept: */*
+Proxy-Connection: Keep-Alive
+Content-Length: 36
+Content-Type: application/x-www-form-urlencoded
+
this is the blurb we want to upload
</protocol>
</verify>
tests/data/test568+18 -18
@@ -80,12 +80,12 @@ m=video 2232 RTP/AVP 31
<strip>
^If-Modified-Since:.*
</strip>
-<protocol>
-ANNOUNCE rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0001 RTSP/1.0
-CSeq: 1
-Content-Length: 306
-Content-Type: application/sdp
-
+<protocol crlf="headers">
+ANNOUNCE rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0001 RTSP/1.0
+CSeq: 1
+Content-Length: 306
+Content-Type: application/sdp
+
v=0
o=mhandley 2890844526 2890845468 IN IP4 126.16.64.4
s=SDP Seminar
@@ -97,19 +97,19 @@ t=2873397496 2873404696
a=recvonly
m=audio 3456 RTP/AVP 0
m=video 2232 RTP/AVP 31
-DESCRIBE rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0002 RTSP/1.0
-CSeq: 2
-Accept: application/sdp
-
-ANNOUNCE rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0003 RTSP/1.0
-CSeq: 3
-Content-Type: posty goodness
-Content-Length: 35
-
+DESCRIBE rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0002 RTSP/1.0
+CSeq: 2
+Accept: application/sdp
+
+ANNOUNCE rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0003 RTSP/1.0
+CSeq: 3
+Content-Type: posty goodness
+Content-Length: 35
+
postyfield=postystuff&project=curl
-OPTIONS rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0004 RTSP/1.0
-CSeq: 4
-
+OPTIONS rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0004 RTSP/1.0
+CSeq: 4
+
</protocol>
</verify>
tests/data/test572+25 -25
@@ -86,35 +86,35 @@ speed
<strip>
^If-Modified-Since:.*
</strip>
-<protocol>
-SETUP rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0001 RTSP/1.0
-CSeq: 1
-Transport: Planes/Trains/Automobiles
-
-GET_PARAMETER rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0002 RTSP/1.0
-CSeq: 2
-Session: getparams-test
-Content-Length: 12
-Content-Type: text/parameters
-
+<protocol crlf="headers">
+SETUP rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0001 RTSP/1.0
+CSeq: 1
+Transport: Planes/Trains/Automobiles
+
+GET_PARAMETER rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0002 RTSP/1.0
+CSeq: 2
+Session: getparams-test
+Content-Length: 12
+Content-Type: text/parameters
+
scale
speed
-GET_PARAMETER rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0003 RTSP/1.0
-CSeq: 3
-Session: getparams-test
-
-GET_PARAMETER rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0004 RTSP/1.0
-CSeq: 4
-Session: getparams-test
-Content-Length: 24
-Content-Type: text/parameters
-
+GET_PARAMETER rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0003 RTSP/1.0
+CSeq: 3
+Session: getparams-test
+
+GET_PARAMETER rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0004 RTSP/1.0
+CSeq: 4
+Session: getparams-test
+Content-Length: 24
+Content-Type: text/parameters
+
packets_received
jitter
-OPTIONS rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0005 RTSP/1.0
-CSeq: 5
-Session: getparams-test
-
+OPTIONS rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0005 RTSP/1.0
+CSeq: 5
+Session: getparams-test
+
</protocol>
</verify>
tests/data/test577+6 -6
@@ -39,12 +39,12 @@ rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER
</client>
<verify>
-<protocol>
-OPTIONS rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER RTSP/1.0
-CSeq: 1
-User-Agent: test567
-Test-Number: 567
-
+<protocol crlf="yes">
+OPTIONS rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER RTSP/1.0
+CSeq: 1
+User-Agent: test567
+Test-Number: 567
+
</protocol>
# 8 == CURLE_WEIRD_SERVER_REPLY
<errorcode>
tests/data/test58+7 -7
@@ -35,13 +35,13 @@ a few bytes
# Verify data after the test has been "shot"
<verify>
-<protocol>
-PUT /we/want/%TESTNUMBERte%5b%5dst.txt HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 12
-
+<protocol crlf="headers">
+PUT /we/want/%TESTNUMBERte%5b%5dst.txt HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 12
+
a few bytes
</protocol>
</verify>
tests/data/test582+0 -2
@@ -34,8 +34,6 @@ Moooooooooooo
# Verify data after the test has been "shot"
<verify>
-<protocol>
-</protocol>
<file name="%LOGDIR/file%TESTNUMBER.txt">
Moooooooooooo
upload this
tests/data/test588+10 -10
@@ -47,19 +47,19 @@ Moooooooooooo
<verify>
# Strip off parts of the PORT and EPRT commands that might differ
<strippart>
-s/^PORT (.*)/PORT/
-s/^EPRT \|1\|(.*)/EPRT \|1\|/
+s/^EPRT \|1\|(\S*)/EPRT \|1\|/
+s/^PORT (\S*)/PORT/
</strippart>
-<protocol>
-USER anonymous
-PASS [email protected]
-PWD
-CWD path
+<protocol crlf="yes">
+USER anonymous
+PASS [email protected]
+PWD
+CWD path
EPRT |1|
PORT
-TYPE I
-STOR %TESTNUMBER
-QUIT
+TYPE I
+STOR %TESTNUMBER
+QUIT
</protocol>
<upload>
Moooooooooooo
tests/data/test591+10 -10
@@ -49,19 +49,19 @@ Moooooooooooo for %TESTNUMBER
<verify>
# Strip off parts of the PORT and EPRT commands that might differ
<strippart>
-s/^PORT (.*)/PORT/
-s/^EPRT \|1\|(.*)/EPRT \|1\|/
+s/^PORT (\S*)/PORT/
+s/^EPRT \|1\|(\S*)/EPRT \|1\|/
</strippart>
-<protocol>
-USER anonymous
-PASS [email protected]
-PWD
-CWD path
+<protocol crlf="yes">
+USER anonymous
+PASS [email protected]
+PWD
+CWD path
EPRT |1|
PORT
-TYPE I
-STOR %TESTNUMBER
-QUIT
+TYPE I
+STOR %TESTNUMBER
+QUIT
</protocol>
# CURLE_FTP_ACCEPT_FAILED = 10
<errorcode>
tests/data/test592+10 -10
@@ -49,20 +49,20 @@ Moooooooooooo for %TESTNUMBER
<verify>
# Strip off parts of the PORT and EPRT commands that might differ
<strippart>
-s/^PORT (.*)/PORT/
-s/^EPRT \|1\|(.*)/EPRT \|1\|/
+s/^PORT (\S*)/PORT/
+s/^EPRT \|1\|(\S*)/EPRT \|1\|/
</strippart>
# a 421 response must prevent further commands from being sent
-<protocol>
-USER anonymous
-PASS [email protected]
-PWD
-CWD path
+<protocol crlf="yes">
+USER anonymous
+PASS [email protected]
+PWD
+CWD path
EPRT |1|
PORT
-TYPE I
-STOR %TESTNUMBER
-QUIT
+TYPE I
+STOR %TESTNUMBER
+QUIT
</protocol>
# CURLE_FTP_ACCEPT_FAILED = 10
<errorcode>
tests/data/test593+10 -10
@@ -49,19 +49,19 @@ Moooooooooooo for %TESTNUMBER
<verify>
# Strip off parts of the PORT and EPRT commands that might differ
<strippart>
-s/^PORT (.*)/PORT/
-s/^EPRT \|1\|(.*)/EPRT \|1\|/
+s/^PORT (\S*)/PORT/
+s/^EPRT \|1\|(\S*)/EPRT \|1\|/
</strippart>
-<protocol>
-USER anonymous
-PASS [email protected]
-PWD
-CWD path
+<protocol crlf="yes">
+USER anonymous
+PASS [email protected]
+PWD
+CWD path
EPRT |1|
PORT
-TYPE I
-STOR %TESTNUMBER
-QUIT
+TYPE I
+STOR %TESTNUMBER
+QUIT
</protocol>
<errorcode>
12
tests/data/test594+10 -10
@@ -51,19 +51,19 @@ Moooooooooooo for %TESTNUMBER
<verify>
# Strip off parts of the PORT and EPRT commands that might differ
<strippart>
-s/^PORT (.*)/PORT/
-s/^EPRT \|1\|(.*)/EPRT \|1\|/
+s/^PORT (\S*)/PORT/
+s/^EPRT \|1\|(\S*)/EPRT \|1\|/
</strippart>
-<protocol>
-USER anonymous
-PASS [email protected]
-PWD
-CWD path
+<protocol crlf="yes">
+USER anonymous
+PASS [email protected]
+PWD
+CWD path
EPRT |1|
PORT
-TYPE I
-STOR %TESTNUMBER
-QUIT
+TYPE I
+STOR %TESTNUMBER
+QUIT
</protocol>
<errorcode>
28
tests/data/test596+9 -9
@@ -44,17 +44,17 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER activeftp
# Verify data after the test has been "shot"
<verify>
<strippart>
-s/^(EPRT \|1\|)(.*)/$1/
+s/^(EPRT \|1\|)(\S*)/$1/
</strippart>
-<protocol>
-USER anonymous
-PASS [email protected]
-PWD
+<protocol crlf="yes">
+USER anonymous
+PASS [email protected]
+PWD
EPRT |1|
-TYPE I
-SIZE %TESTNUMBER
-RETR %TESTNUMBER
-QUIT
+TYPE I
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
+QUIT
</protocol>
</verify>
</testcase>
tests/data/test758+0 -2
@@ -47,7 +47,5 @@ https://localhost:%HTTPSPORT/file%TESTNUMBER
# Verify data after the test has been "shot"
<verify>
-<protocol>
-</protocol>
</verify>
</testcase>
tests/data/test766+6 -6
@@ -34,18 +34,18 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
<verify>
# Strip off parts of the EPRT command that might differ
<strippart>
-s/^EPRT \|1\|(.*)/EPRT \|1\|/
+s/^EPRT \|1\|(\S*)/EPRT \|1\|/
</strippart>
# The TYPE command might get sent so we ignore that
<strip>
^TYPE
</strip>
-<protocol>
-USER anonymous
-PASS [email protected]
-PWD
-CWD path
+<protocol crlf="yes">
+USER anonymous
+PASS [email protected]
+PWD
+CWD path
EPRT |1|
</protocol>
tests/data/test785+8 -8
@@ -45,14 +45,14 @@ On the first Monday of the month of April, 1625, the market town of Meung
#
# Verify data after the test has been "shot"
<verify>
-<protocol>
-POST /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 69
-Content-Type: application/x-www-form-urlencoded
-
+<protocol crlf="headers">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 69
+Content-Type: application/x-www-form-urlencoded
+
e first Monday of the month of April, 1625, the market town of Meung
</protocol>
</verify>
tests/data/test786+8 -8
@@ -45,14 +45,14 @@ On the first Monday of the month of April, 1625, the market town of Meung
#
# Verify data after the test has been "shot"
<verify>
-<protocol nonewline="yes">
-POST /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 11
-Content-Type: application/x-www-form-urlencoded
-
+<protocol crlf="headers" nonewline="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 11
+Content-Type: application/x-www-form-urlencoded
+
e first Mon
</protocol>
</verify>
tests/data/test88+14 -14
@@ -76,20 +76,20 @@ four is the number of lines
# Verify data after the test has been "shot"
<verify>
-<protocol>
-PUT /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 0
-
-PUT /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="78a49fa53d0c228778297687d4168e71"
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 85
-
+<protocol crlf="headers">
+PUT /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 0
+
+PUT /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="78a49fa53d0c228778297687d4168e71"
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 85
+
This is data we upload with PUT
a second line
line three
tests/data/test95+8 -8
@@ -67,14 +67,14 @@ User-Agent: curl/%VERSION
Proxy-Connection: Keep-Alive
</proxy>
-<protocol nonewline="yes">
-POST /we/want/that/page/%TESTNUMBER HTTP/1.1
-Host: test.%TESTNUMBER:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 27
-Content-Type: application/x-www-form-urlencoded
-
+<protocol crlf="headers" nonewline="yes">
+POST /we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: test.%TESTNUMBER:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 27
+Content-Type: application/x-www-form-urlencoded
+
datatopost=ohthatsfunyesyes
</protocol>
</verify>
tests/data/test97+8 -8
@@ -36,14 +36,14 @@ HTTP POST with custom content-type
#
# Verify data after the test has been "shot"
<verify>
-<protocol nonewline="yes">
-POST /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Type: silly/type
-Content-Length: 14
-
+<protocol crlf="headers" nonewline="yes">
+POST /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Type: silly/type
+Content-Length: 14
+
hejsanallabarn
</protocol>
</verify>
tests/data/test970+6 -6
@@ -51,12 +51,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --write-out '%{json}' -o %LOGDIR/out%TESTNU
#
# Verify data after the test has been "shot"
<verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
</protocol>
<stdout nonewline="yes">
{"certs":"","conn_id":0,"content_type":"text/html","errormsg":null,"exitcode":0,"filename_effective":"%LOGDIR/out%TESTNUMBER","ftp_entry_path":null,"http_code":200,"http_connect":0,"http_version":"1.1","local_ip":"127.0.0.1","local_port":13,"method":"GET","num_certs":0,"num_connects":1,"num_headers":9,"num_redirects":0,"num_retries":0,"proxy_ssl_verify_result":0,"proxy_used":0,"redirect_url":null,"referer":null,"remote_ip":"%HOSTIP","remote_port":%HTTPPORT,"response_code":200,"scheme":"http","size_download":445,"size_header":4019,"size_request":4019,"size_upload":0,"speed_download":13,"speed_upload":13,"ssl_verify_result":0,"time_appconnect":0.000013,"time_connect":0.000013,"time_namelookup":0.000013,"time_posttransfer":0.000013,"time_pretransfer":0.000013,"time_queue":0.000013,"time_redirect":0.000013,"time_starttransfer":0.000013,"time_total":0.000013,"tls_earlydata":0,"url":"http://%HOSTIP:%HTTPPORT/%TESTNUMBER","url.fragment":null,"url.host":"127.0.0.1","url.options":null,"url.password":null,"url.path":"/%TESTNUMBER","url.port":"%HTTPPORT","url.query":null,"url.scheme":"http","url.user":null,"url.zoneid":null,"url_effective":"http://%HOSTIP:%HTTPPORT/%TESTNUMBER","urle.fragment":null,"urle.host":"127.0.0.1","urle.options":null,"urle.password":null,"urle.path":"/%TESTNUMBER","urle.port":"%HTTPPORT","urle.query":null,"urle.scheme":"http","urle.user":null,"urle.zoneid":null,"urlnum":0,"xfer_id":0,"curl_version":"curl-unit-test-fake-version"}
tests/data/test972+6 -6
@@ -52,12 +52,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -s --write-out '%{json}\n' -o %LOGDIR/out97
#
# Verify data after the test has been "shot"
<verify>
-<protocol>
-GET /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-
+<protocol crlf="yes">
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
</protocol>
<stdout mode="text">
{"certs":"","conn_id":0,"content_type":"text/html","errormsg":null,"exitcode":0,"filename_effective":"%LOGDIR/out%TESTNUMBER","ftp_entry_path":null,"http_code":200,"http_connect":0,"http_version":"1.1","local_ip":"127.0.0.1","local_port":13,"method":"GET","num_certs":0,"num_connects":1,"num_headers":9,"num_redirects":0,"num_retries":0,"proxy_ssl_verify_result":0,"proxy_used":0,"redirect_url":null,"referer":null,"remote_ip":"%HOSTIP","remote_port":%HTTPPORT,"response_code":200,"scheme":"http","size_download":445,"size_header":4019,"size_request":4019,"size_upload":0,"speed_download":13,"speed_upload":13,"ssl_verify_result":0,"time_appconnect":0.000013,"time_connect":0.000013,"time_namelookup":0.000013,"time_posttransfer":0.000013,"time_pretransfer":0.000013,"time_queue":0.000013,"time_redirect":0.000013,"time_starttransfer":0.000013,"time_total":0.000013,"tls_earlydata":0,"url":"http://%HOSTIP:%HTTPPORT/%TESTNUMBER","url.fragment":null,"url.host":"127.0.0.1","url.options":null,"url.password":null,"url.path":"/%TESTNUMBER","url.port":"%HTTPPORT","url.query":null,"url.scheme":"http","url.user":null,"url.zoneid":null,"url_effective":"http://%HOSTIP:%HTTPPORT/%TESTNUMBER","urle.fragment":null,"urle.host":"127.0.0.1","urle.options":null,"urle.password":null,"urle.path":"/%TESTNUMBER","urle.port":"%HTTPPORT","urle.query":null,"urle.scheme":"http","urle.user":null,"urle.zoneid":null,"urlnum":0,"xfer_id":0,"curl_version":"curl-unit-test-fake-version"}
tests/data/test977+7 -7
@@ -44,13 +44,13 @@ URL with trailing dot and receiving a cookie for the TLD with dot
#
# Verify data after the test has been "shot"
<verify>
-<protocol>
-GET http://firsthost.me./ HTTP/1.1
-Host: firsthost.me.
-User-Agent: curl/%VERSION
-Accept: */*
-Proxy-Connection: Keep-Alive
-
+<protocol crlf="yes">
+GET http://firsthost.me./ HTTP/1.1
+Host: firsthost.me.
+User-Agent: curl/%VERSION
+Accept: */*
+Proxy-Connection: Keep-Alive
+
</protocol>
<file name="%LOGDIR/cookies%TESTNUMBER" mode="text">
# Netscape HTTP Cookie File
tests/data/test98+8 -8
@@ -39,14 +39,14 @@ data on stdin
#
# Verify data after the test has been "shot"
<verify>
-<protocol>
-PUT /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-Content-Length: 14
-Expect: 100-continue
-
+<protocol crlf="headers">
+PUT /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 14
+Expect: 100-continue
+
data on stdin
</protocol>
</verify>
tests/data/test985+2 -2
@@ -47,8 +47,8 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret --ssl-reqd
<errorcode>
64
</errorcode>
-<protocol>
-CAPA
+<protocol crlf="yes">
+CAPA
</protocol>
</verify>
</testcase>
tests/data/test986+3 -3
@@ -45,9 +45,9 @@ works
<errorcode>
64
</errorcode>
-<protocol>
-AUTH SSL
-AUTH TLS
+<protocol crlf="yes">
+AUTH SSL
+AUTH TLS
</protocol>
</verify>
</testcase>
tests/runtests.pl+4 -1
@@ -1403,7 +1403,10 @@ sub singletest_check {
}
}
- if($hash{'crlf'}) {
+ if($hash{'crlf'} eq "headers") {
+ subnewlines(0, \$_) for @protocol;
+ }
+ elsif($hash{'crlf'}) {
subnewlines(1, \$_) for @protocol;
}
tests/testutil.pm+2 -1
@@ -165,7 +165,8 @@ sub subnewlines {
}
if(($$thing =~ /^HTTP\/(1.1|1.0|2|3) [1-5][^\x0d]*\z/) ||
- ($$thing =~ /^(GET|POST|PUT|DELETE) \S+ HTTP\/\d+(\.\d+)?/) ||
+ ($$thing =~ /^(GET|HEAD|POST|PUT|DELETE|CONNECT) \S+ HTTP\/\d+(\.\d+)?/) ||
+ ($$thing =~ /^(SETUP|GET_PARAMETER|OPTIONS|ANNOUNCE|DESCRIBE) \S+ RTSP\/\d+(\.\d+)?/) ||
(($$thing =~ /^[a-z0-9_-]+: [^\x0d]*\z/i) &&
# skip curl error messages
($$thing !~ /^curl: \(\d+\) /))) {