tests: remove leading spaces from some tags

The threee tags `<name>`, `</name>` and `<command>` were frequently used
with a leading space that this removes. The reason this habbit is so
widespread in testcases is probably that they have been copy and pasted.

Hence, fixing them all now might curb this practice from now on.

Closes #12028

diff --git a/tests/data/test1 b/tests/data/test1
index 700bed8993443d1ec8d73f2806d797aaff0fdb1f..4aa4d1b81267feb3de725ba115b2f089602e045e 100644 (file)
--- a/tests/data/test1
+++ b/tests/data/test1
@@ -31,10 +31,10 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test10 b/tests/data/test10
index b52850fa5032e191745c77f87e585655847f13d2..ac1486ec09119117166f1635ee960eba257d2de1 100644 (file)
--- a/tests/data/test10
+++ b/tests/data/test10
@@ -22,10 +22,10 @@ blablabla
 <server>
 http
 </server>
- <name>
+<name>
 simple HTTP PUT from file
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt
 </command>
 <file name="%LOGDIR/test%TESTNUMBER.txt">

diff --git a/tests/data/test100 b/tests/data/test100
index e680a7b4a51a2cd6b2f380f46434521dfc7e2708..de6a82bda99fe512f97b7e43538b8ce266e9d512 100644 (file)
--- a/tests/data/test100
+++ b/tests/data/test100
@@ -32,10 +32,10 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP dir list PASV
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/
 </command>
 </client>

diff --git a/tests/data/test1000 b/tests/data/test1000
index 37f210ed8c380882a44f676c419a6a265c2492d6..fe94010ac313d4a0c75fda2cbf766e7962e61104 100644 (file)
--- a/tests/data/test1000
+++ b/tests/data/test1000
@@ -20,10 +20,10 @@ NOBODY
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP dir list PASV with -I
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ -I
 </command>
 </client>

diff --git a/tests/data/test1001 b/tests/data/test1001
index 8900a80a2325f41a94b1f36a726a9e84ee52a62c..4220ab6759ef6188a132c964d4367e7632bb5bdb 100644 (file)
--- a/tests/data/test1001
+++ b/tests/data/test1001
@@ -68,10 +68,10 @@ http
 crypto
 proxy
 </features>
- <name>
+<name>
 HTTP POST --digest with PUT and resumed upload and modified method
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -T %LOGDIR/%TESTNUMBER -x  http://%HOSTIP:%HTTPPORT -C 2 -X GET
 </command>
 <file name="%LOGDIR/%TESTNUMBER">

diff --git a/tests/data/test1002 b/tests/data/test1002
index 3a098f10d364e5e83f6b33b6133eb257961270fe..92cb5e158532331e5c7f68b01ccf28625175d459 100644 (file)
--- a/tests/data/test1002
+++ b/tests/data/test1002
@@ -67,10 +67,10 @@ http
 crypto
 proxy
 </features>
- <name>
+<name>
 HTTP PUT with Digest auth, resumed upload and modified method, twice
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload1 -T %LOGDIR/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload2 -T %LOGDIR/%TESTNUMBER -u auser:apasswd --digest -x  http://%HOSTIP:%HTTPPORT -C 2 -X GET
 </command>
 <file name="%LOGDIR/%TESTNUMBER">

diff --git a/tests/data/test1003 b/tests/data/test1003
index 9adc996a928a121aaa3d212bf116771775c1dc9c..06cfbb61b0ac11c268131e32c786a41dc791087a 100644 (file)
--- a/tests/data/test1003
+++ b/tests/data/test1003
@@ -23,10 +23,10 @@ REPLY CWD 250 CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP with excessively large server command response line
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1004 b/tests/data/test1004
index 3b75081bd4d1163c08b3f7155418adcd47904c4f..d176a16582fbb067cdf16fd03af0f05d49775a1c 100644 (file)
--- a/tests/data/test1004
+++ b/tests/data/test1004
@@ -35,10 +35,10 @@ proxy
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with empty proxy
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy ""
 </command>
 </client>

diff --git a/tests/data/test1005 b/tests/data/test1005
index 59d98cc6590aea7e11c2aa1bca20325a4da2f656..28af85f40e1e621c7c53448a1af5321fca4d6361 100644 (file)
--- a/tests/data/test1005
+++ b/tests/data/test1005
@@ -23,10 +23,10 @@ REPLY CWD 250-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP with excessively large number of server command response lines
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1006 b/tests/data/test1006
index 08f7247c1713645a8b56be7643b0c5400c00481b..394b5563b3c0d8b6b2f5558f5cc2057ee00df40c 100644 (file)
--- a/tests/data/test1006
+++ b/tests/data/test1006
@@ -24,10 +24,10 @@ REPLY CWD 250-AAAAAAAAAAAAAAAAAAAAAAAAA\r\n250-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP with excessively large number of server command response lines (boundary condition)
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1007 b/tests/data/test1007
index e9f11c8b99235faab5078de97519674ea144e4fd..603d4c6390c6ef92940da4acf0f4f78af6e614d6 100644 (file)
--- a/tests/data/test1007
+++ b/tests/data/test1007
@@ -13,10 +13,10 @@ FAILURE
 <server>
 tftp
 </server>
- <name>
+<name>
 TFTP send with invalid permission on server
- </name>
- <command>
+</name>
+<command>
 -T %LOGDIR/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//invalid-file -sS
 </command>
 <file name="%LOGDIR/test%TESTNUMBER.txt">

diff --git a/tests/data/test1009 b/tests/data/test1009
index 041d88198d08d83a289bcd8b0bb6b39ef6c4653c..0282dca2eaf384d942ce64728c4ab2d73de48a10 100644 (file)
--- a/tests/data/test1009
+++ b/tests/data/test1009
@@ -24,10 +24,10 @@ returned
 <server>
 tftp
 </server>
- <name>
+<name>
 TFTP retrieve with --local-port
- </name>
- <command>
+</name>
+<command>
 tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER --local-port 44444-45444
 </command>
 </client>

diff --git a/tests/data/test101 b/tests/data/test101
index 09faade2db2a9054a2b2eac32b960aa9ff82a9a0..26824c741156f48d17e2df09940c99e4cf63763c 100644 (file)
--- a/tests/data/test101
+++ b/tests/data/test101
@@ -30,10 +30,10 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP dir list, PORT with specified IP
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/ -P %CLIENTIP
 </command>
 </client>

diff --git a/tests/data/test1010 b/tests/data/test1010
index 9314ca66ee16f5ef62fc0bf2b3a5555d05d81d4d..d1eee918af221e3eecc611d3ff0c94dfa0399018 100644 (file)
--- a/tests/data/test1010
+++ b/tests/data/test1010
@@ -32,10 +32,10 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP dir list nocwd
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT//list/this/path/%TESTNUMBER/ ftp://%HOSTIP:%FTPPORT//list/this/path/%TESTNUMBER/ --ftp-method nocwd
 </command>
 </client>

diff --git a/tests/data/test1011 b/tests/data/test1011
index 1ff01ca6b8f6cf47245ce8ced807d47973bcd8ae..d6a3d1aa7d072a14bfd458646beef124a8f9cb8c 100644 (file)
--- a/tests/data/test1011
+++ b/tests/data/test1011
@@ -45,10 +45,10 @@ body
 <server>
 http
 </server>
- <name>
+<name>
 HTTP POST with 301 redirect
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d "moo"
 </command>
 </client>

diff --git a/tests/data/test1012 b/tests/data/test1012
index af17bb81843bb368f706a60bb5a0813991b08cce..da6ec61922d070f51ea6e0d8beaaca78e6226faa 100644 (file)
--- a/tests/data/test1012
+++ b/tests/data/test1012
@@ -45,10 +45,10 @@ body
 <server>
 http
 </server>
- <name>
+<name>
 HTTP POST with 301 redirect and --post301
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d "moo" --post301
 </command>
 </client>

diff --git a/tests/data/test1013 b/tests/data/test1013
index 70c6455e307914fa9cb3ee9bbcb8164925e3bf56..d748657b5df28117624505a7a5afe95615c6b7c4 100644 (file)
--- a/tests/data/test1013
+++ b/tests/data/test1013
@@ -16,10 +16,10 @@ curl-config
 <server>
 none
 </server>
- <name>
+<name>
 Compare curl --version with curl-config --protocols
- </name>
- <command>
+</name>
+<command>
 --version
 </command>
 <postcheck>

diff --git a/tests/data/test1014 b/tests/data/test1014
index 8dc3f0421ed6a62f1c2e7269108377bb824b7b1f..f03ac859db44567aa437de59be71ec578eccab42 100644 (file)
--- a/tests/data/test1014
+++ b/tests/data/test1014
@@ -16,10 +16,10 @@ curl-config
 <server>
 none
 </server>
- <name>
+<name>
 Compare curl --version with curl-config --features
- </name>
- <command>
+</name>
+<command>
 --version
 </command>
 <postcheck>

diff --git a/tests/data/test1015 b/tests/data/test1015
index 47f382775d6e7380ef609ad5c5058ceef17e505c..fc26149121d6130f2b22bcc9a872ec93038ffa64 100644 (file)
--- a/tests/data/test1015
+++ b/tests/data/test1015
@@ -24,10 +24,10 @@ Content-Length: 0
 <server>
 http
 </server>
- <name>
+<name>
 --data-urlencode
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --data-urlencode "my name is moo[]" --data-urlencode "y e s=s_i_r" --data-urlencode "v_alue@%LOGDIR/%TESTNUMBER.txt" --data-urlencode @%LOGDIR/%TESTNUMBER.txt
 </command>
 <file name="%LOGDIR/%TESTNUMBER.txt">

diff --git a/tests/data/test1016 b/tests/data/test1016
index d37e585e05d59d115957826a15ca79951ba3bbf9..452d11c8a0f64ea394004d06ae05b4106cae3303 100644 (file)
--- a/tests/data/test1016
+++ b/tests/data/test1016
@@ -19,9 +19,9 @@ none
 <features>
 file
 </features>
- <name>
+<name>
 X-Y range on a file:// URL to stdout
- </name>
+</name>
 <command option="no-include">
 -r 1-4 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt
 </command>

diff --git a/tests/data/test1017 b/tests/data/test1017
index bda9c2d49fd76fe815279c5c3bfa2423a5866860..ceb32f20e808498b2d8317cdade2a73a67f5f7f8 100644 (file)
--- a/tests/data/test1017
+++ b/tests/data/test1017
@@ -20,9 +20,9 @@ none
 <features>
 file
 </features>
- <name>
+<name>
 0-Y range on a file:// URL to stdout
- </name>
+</name>
 <command option="no-include">
 -r 0-3 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt
 </command>

diff --git a/tests/data/test1018 b/tests/data/test1018
index 2d0d1574e0a618e3259b2c76bae551e9196c332a..210f1d386f25abfe904c75063c842b1e6f135450 100644 (file)
--- a/tests/data/test1018
+++ b/tests/data/test1018
@@ -19,9 +19,9 @@ none
 <features>
 file
 </features>
- <name>
+<name>
 X-X range on a file:// URL to stdout
- </name>
+</name>
 <command option="no-include">
 -r 4-4 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt
 </command>

diff --git a/tests/data/test1019 b/tests/data/test1019
index ecf74fe9e60214e3ec5a5e2e09407e1f3a968601..73d6cb0616f9278174a7ba1a711414b222301373 100644 (file)
--- a/tests/data/test1019
+++ b/tests/data/test1019
@@ -20,9 +20,9 @@ none
 <features>
 file
 </features>
- <name>
+<name>
 X- range on a file:// URL to stdout
- </name>
+</name>
 <command option="no-include">
 -r 7- file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt
 </command>

diff --git a/tests/data/test102 b/tests/data/test102
index 19be9356472083f6c327520e7344fe7b56040538..7037986f46a961b14338baba6929faacf3e9777d 100644 (file)
--- a/tests/data/test102
+++ b/tests/data/test102
@@ -26,10 +26,10 @@ REPLY EPSV 500 no such command
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP RETR PASV
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 

diff --git a/tests/data/test1020 b/tests/data/test1020
index 2a92908d5f5bfeeef15c7a542078386aabe07983..c2cd7f2d23cde900fb0e2a56dd8aa07f033bc28f 100644 (file)
--- a/tests/data/test1020
+++ b/tests/data/test1020
@@ -20,9 +20,9 @@ none
 <features>
 file
 </features>
- <name>
+<name>
 -Y range on a file:// URL to stdout
- </name>
+</name>
 <command option="no-include">
 -r -9 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt
 </command>

diff --git a/tests/data/test1022 b/tests/data/test1022
index 2288e9b99acb8b486e62621e73be289dc999624c..6a5dd2180a660bb3f7409dea9e597013fc02c957 100644 (file)
--- a/tests/data/test1022
+++ b/tests/data/test1022
@@ -16,10 +16,10 @@ curl-config
 <server>
 none
 </server>
- <name>
+<name>
 Compare curl --version with curl-config --version
- </name>
- <command>
+</name>
+<command>
 --version
 </command>
 <postcheck>

diff --git a/tests/data/test1023 b/tests/data/test1023
index 27a144db55358ad216f024066a865ed0fbf9c9c6..1d8cbfb4c06ad8ae664c701f9fb104adee5ab286 100644 (file)
--- a/tests/data/test1023
+++ b/tests/data/test1023
@@ -16,10 +16,10 @@ curl-config
 <server>
 none
 </server>
- <name>
+<name>
 Compare curl --version with curl-config --vernum
- </name>
- <command>
+</name>
+<command>
 --version
 </command>
 <postcheck>

diff --git a/tests/data/test1024 b/tests/data/test1024
index fbd1db4223faa32faacd63e18a31bf5c65c5d6c2..55deec98bbdb01ce14d3539de7b356e940539413 100644 (file)
--- a/tests/data/test1024
+++ b/tests/data/test1024
@@ -71,10 +71,10 @@ If this is received, the location following worked
 <server>
 http
 </server>
- <name>
+<name>
 HTTP Location: following with cookies
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -c %LOGDIR/jar%TESTNUMBER
 </command>
 <features>

diff --git a/tests/data/test1025 b/tests/data/test1025
index 039824c1aeee66f968bf664a461ca37856cc69e9..762e34a8354e15c8e9bf5b4998bdc52e4e568e2b 100644 (file)
--- a/tests/data/test1025
+++ b/tests/data/test1025
@@ -71,10 +71,10 @@ If this is received, the location following worked
 <server>
 http
 </server>
- <name>
+<name>
 HTTP Location: following with command-line and server cookies
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -c %LOGDIR/jar%TESTNUMBER -b forcedcookie=yes
 </command>
 <features>

diff --git a/tests/data/test1026 b/tests/data/test1026
index f836e9875a2dbf40150e1c61ae58457ef9f80efd..d565f24d5f2ee487f8c887199971147cc12c73e8 100644 (file)
--- a/tests/data/test1026
+++ b/tests/data/test1026
@@ -19,10 +19,10 @@ manual
 <server>
 none
 </server>
- <name>
+<name>
 curl --manual
- </name>
- <command>
+</name>
+<command>
 --manual
 </command>
 # Search for these two sentinel lines in the manual output; if they are found,

diff --git a/tests/data/test1027 b/tests/data/test1027
index 6ce71b0cc7769b0effdaf67804761f1d1256a382..1d076000b04e913306c63e90f8e4929905463e0d 100644 (file)
--- a/tests/data/test1027
+++ b/tests/data/test1027
@@ -16,10 +16,10 @@
 <server>
 none
 </server>
- <name>
+<name>
 curl --help
- </name>
- <command>
+</name>
+<command>
 --help
 </command>
 # Search for these two sentinel lines in the help output; if they are found,

diff --git a/tests/data/test1028 b/tests/data/test1028
index cff3028157a53a155b3694e29d266a305c3808d4..3e36597322fd8b9c3c89bb9ad34244ac05082d00 100644 (file)
--- a/tests/data/test1028
+++ b/tests/data/test1028
@@ -41,10 +41,10 @@ works
 http
 ftp
 </server>
- <name>
+<name>
 HTTP Location: redirect to FTP URL
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -L
 </command>
 </client>

diff --git a/tests/data/test1029 b/tests/data/test1029
index f39ac6ed47fe5033bf9d42b8db5a49259b6cedc4..da393cb41b82571d0d1c8b4a73e66eae4d71f707 100644 (file)
--- a/tests/data/test1029
+++ b/tests/data/test1029
@@ -26,9 +26,9 @@ This server reply is for testing a simple Location: following
 <server>
 http
 </server>
- <name>
+<name>
 HTTP Location: and 'redirect_url' check
- </name>
+</name>
 <command>
 http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w '%{redirect_url} %{url} %{exitcode} %{errormsg}\n'
 </command>

diff --git a/tests/data/test103 b/tests/data/test103
index 308c15491f3b6f4dfe2be87a06a79557d7ab5149..52e5645bc0eab1ce9928cc07591e474b7c0d819d 100644 (file)
--- a/tests/data/test103
+++ b/tests/data/test103
@@ -23,10 +23,10 @@ works
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP RETR PORT with CWD
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER -P -
 </command>
 </client>

diff --git a/tests/data/test1030 b/tests/data/test1030
index c84033af3cce06f29a25b7b9de32f91633077ee5..1421e769bac10f208946aa2b4fd54b095eb289b3 100644 (file)
--- a/tests/data/test1030
+++ b/tests/data/test1030
@@ -63,10 +63,10 @@ http
 !SSPI
 crypto
 </features>
- <name>
+<name>
 HTTP PUT with --anyauth authorization (picking Digest)
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/put%TESTNUMBER -u testuser:testpass --anyauth
 </command>
 <file name="%LOGDIR/put%TESTNUMBER">

diff --git a/tests/data/test1031 b/tests/data/test1031
index c6e479588f985c1e6e51f54e8cb30002139a8ac3..305a0f7eb57e94b4fc4d22ce2dda0aeb9cc910cc 100644 (file)
--- a/tests/data/test1031
+++ b/tests/data/test1031
@@ -49,10 +49,10 @@ If this is received, the location following worked
 <server>
 http
 </server>
- <name>
+<name>
 HTTP Location: following to a query string
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/want/this/%TESTNUMBER -L
 </command>
 </client>

diff --git a/tests/data/test1032 b/tests/data/test1032
index 8af07dc78c3062235756ea5992a265b81fb4eb2d..5456542ae3ed92318f794d08ce44a83ee3c0b1e8 100644 (file)
--- a/tests/data/test1032
+++ b/tests/data/test1032
@@ -31,10 +31,10 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 HTTP HEAD with --range
- </name>
- <command>
+</name>
+<command>
 --range 1-3 --head http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1033 b/tests/data/test1033
index 7d9ff0364b96b4467560f4ae6a91c2d60b6f37d1..b19bf1ce96fd90582ff07f8522405e90190eff41 100644 (file)
--- a/tests/data/test1033
+++ b/tests/data/test1033
@@ -36,10 +36,10 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with 102 response!
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1034 b/tests/data/test1034
index ec41651a217c0fe7ec08b7788509184efeeaa109..2a8170487e161407bb13962bb654bd7c92e16c92 100644 (file)
--- a/tests/data/test1034
+++ b/tests/data/test1034
@@ -34,16 +34,16 @@ LC_CTYPE=en_US.UTF-8
 <precheck>
 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
 </precheck>
- <name>
+<name>
 HTTP over proxy with malformatted IDN host name
- </name>
+</name>
 
 # This host name contains an invalid UTF-8 byte sequence that can't be
 # converted into an IDN name
 <stdin>
 url = "http://invalid-utf8-â\90.local/page/%TESTNUMBER"
 </stdin>
- <command>
+<command>
 -K - -x %HOSTIP:%NOLISTENPORT
 </command>
 </client>

diff --git a/tests/data/test1035 b/tests/data/test1035
index 73d8aefed5c57c7ba92322e5d21fe6c2247f2827..1ace9428dd37459757d68c6bb7c7c6ad116b8302 100644 (file)
--- a/tests/data/test1035
+++ b/tests/data/test1035
@@ -32,10 +32,10 @@ LC_CTYPE=en_US.UTF-8
 <precheck>
 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
 </precheck>
- <name>
+<name>
 HTTP over proxy with too long IDN host name
- </name>
- <command>
+</name>
+<command>
 http://too-long-IDN-name-cürl-rüles-la-la-la-dee-da-flooby-nooby.local/page/%TESTNUMBER -x %HOSTIP:%NOLISTENPORT
 </command>
 </client>

diff --git a/tests/data/test1036 b/tests/data/test1036
index 88183bc7df4a51448ad645f85278b8192318e87f..f777a6ff7dd7fb374ec1b39f65dadf24a040bc6e 100644 (file)
--- a/tests/data/test1036
+++ b/tests/data/test1036
@@ -27,10 +27,10 @@ REPLY EPSV 500 no such command
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP download resume from end of file
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C -
 </command>
 <file name="%LOGDIR/curl%TESTNUMBER.out">

diff --git a/tests/data/test1037 b/tests/data/test1037
index 6d3ede54ac6b2f721bc77dfefc9896b7fe450934..18c9e5266a40d5ca174ace734090dd4c996ab0eb 100644 (file)
--- a/tests/data/test1037
+++ b/tests/data/test1037
@@ -27,10 +27,10 @@ REPLY EPSV 500 no such command
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP download resume from end of empty file
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C -
 </command>
 <file name="%LOGDIR/curl%TESTNUMBER.out">

diff --git a/tests/data/test1038 b/tests/data/test1038
index 46fe821fa941da280a3697745bb12065c5577b98..c2e60a0a49944b58de1db6adbb205f0176566f09 100644 (file)
--- a/tests/data/test1038
+++ b/tests/data/test1038
@@ -19,10 +19,10 @@ Resume
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP PASV upload resume from end of file
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -C -
 </command>
 <file name="%LOGDIR/upload%TESTNUMBER">

diff --git a/tests/data/test1039 b/tests/data/test1039
index 9f6d51306bb81ba49abbacb548e55a22a5079272..a032c2f9ab5cc8dca28ff66391b7feccb9eca184 100644 (file)
--- a/tests/data/test1039
+++ b/tests/data/test1039
@@ -19,10 +19,10 @@ Resume
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP PASV upload resume from end of empty file
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -C -
 </command>
 <file name="%LOGDIR/upload%TESTNUMBER">

diff --git a/tests/data/test104 b/tests/data/test104
index 8b44911dec60a573b8080cbdca96950479806e09..3674f1da0a8dd918dc09f63f2c22219691215ae4 100644 (file)
--- a/tests/data/test104
+++ b/tests/data/test104
@@ -17,10 +17,10 @@ NOBODY
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP --head to get file size only
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER --head
 </command>
 </client>

diff --git a/tests/data/test1040 b/tests/data/test1040
index 21410c6e97cebfa6d2c1fb6243f38c83ae69fceb..bd1e5b0e3238f5e03a77c429ec4417d845bf2288 100644 (file)
--- a/tests/data/test1040
+++ b/tests/data/test1040
@@ -43,10 +43,10 @@ Content-Length: 0
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with resume from end of entirely-downloaded file
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C -
 </command>
 <file name="%LOGDIR/curl%TESTNUMBER.out">

diff --git a/tests/data/test1041 b/tests/data/test1041
index 4e23e2cb6cdd8c6de801d660c882d555a7a0bcbc..bb793d51ead829352ddcbe7d45491627ada893f9 100644 (file)
--- a/tests/data/test1041
+++ b/tests/data/test1041
@@ -28,9 +28,9 @@ Content-Type: text/html
 <server>
 http
 </server>
- <name>
+<name>
 HTTP PUT with resume from end of already-uploaded file
- </name>
+</name>
 <file name="%LOGDIR/test%TESTNUMBER.txt">
 012345678
 012345678
@@ -43,7 +43,7 @@ HTTP PUT with resume from end of already-uploaded file
 012345678
 012345678
 </file>
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T%LOGDIR/test%TESTNUMBER.txt -C -
 </command>
 </client>

diff --git a/tests/data/test1042 b/tests/data/test1042
index f05c873639df4d204c1f9ab88bb76e544353e28a..a2a5c62f36c24e75c5704b14a14f09afa597d476 100644 (file)
--- a/tests/data/test1042
+++ b/tests/data/test1042
@@ -55,10 +55,10 @@ Content-Type: text/plain
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET beyond end of entirely-downloaded file, no server resume
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 200
 </command>
 <file name="%LOGDIR/curl%TESTNUMBER.out">

diff --git a/tests/data/test1043 b/tests/data/test1043
index 310256f65b560c11f676eb25c8b8fd6f2a21fcb1..ea850a1f97df1dadfd54d03a39c65b90da2a9c88 100644 (file)
--- a/tests/data/test1043
+++ b/tests/data/test1043
@@ -54,10 +54,10 @@ Content-Range: bytes 40-99/100
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with resume from end of file
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C -
 </command>
 <file name="%LOGDIR/curl%TESTNUMBER.out">

diff --git a/tests/data/test1044 b/tests/data/test1044
index c5f3a29251a24fb4c5da49e7dedd72c36b468897..96a4f48c2303caf63eaf7d631f9324dbf076827a 100644 (file)
--- a/tests/data/test1044
+++ b/tests/data/test1044
@@ -28,10 +28,10 @@ large_file
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP download large file info with -I
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -I
 </command>
 </client>

diff --git a/tests/data/test1045 b/tests/data/test1045
index c2c7df7f681bd5f8858552619cddb36318e410b5..e8745bf2de36b75ced1bd682623856ac9ac5372e 100644 (file)
--- a/tests/data/test1045
+++ b/tests/data/test1045
@@ -28,10 +28,10 @@ Content-Type: text/plain
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with numeric localhost --interface
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --interface %CLIENTIP
 </command>
 </client>

diff --git a/tests/data/test1046 b/tests/data/test1046
index f781098934c9b8e82fbe31b0c932080959647445..c6bdcbb24bc4bed5b773c7cf9fec283bd325e576 100644 (file)
--- a/tests/data/test1046
+++ b/tests/data/test1046
@@ -32,10 +32,10 @@ ipv6
 <server>
 http-ipv6
 </server>
- <name>
+<name>
 HTTP-IPv6 GET with numeric localhost --interface
- </name>
- <command>
+</name>
+<command>
 -g "http://%HOST6IP:%HTTP6PORT/%TESTNUMBER" --interface ::1
 </command>
 # --interface doesn't accept an address surrounded by [] so %CLIENT6IP is out

diff --git a/tests/data/test1047 b/tests/data/test1047
index 028a8a6cc58d79c8a05ecd2beb99e61e83dd540a..d54a8494db07f627f730a7240cced1c3eb83e087 100644 (file)
--- a/tests/data/test1047
+++ b/tests/data/test1047
@@ -34,10 +34,10 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP dir list PASV with localhost --interface
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/ --interface %CLIENTIP
 </command>
 </client>

diff --git a/tests/data/test1048 b/tests/data/test1048
index e81e19f263b95deecd1fb7e7c801d5ca1dd7fe20..56f19c4af33188388ee45bb7da3aab5841c6ee3a 100644 (file)
--- a/tests/data/test1048
+++ b/tests/data/test1048
@@ -39,10 +39,10 @@ ipv6
 <server>
 ftp-ipv6
 </server>
- <name>
+<name>
 FTP-IPv6 dir list PASV with localhost --interface
- </name>
- <command>
+</name>
+<command>
 -g "ftp://%HOST6IP:%FTP6PORT/" --interface ::1
 </command>
 # --interface doesn't accept an address surrounded by [] so %CLIENT6IP is out

diff --git a/tests/data/test1049 b/tests/data/test1049
index 165ba1ea795b6be28ee1b9fc363b3781144953c4..e59741f519607ae4cdc077db95909e62615ae5eb 100644 (file)
--- a/tests/data/test1049
+++ b/tests/data/test1049
@@ -24,10 +24,10 @@ returned
 <server>
 tftp
 </server>
- <name>
+<name>
 TFTP retrieve with localhost --interface
- </name>
- <command>
+</name>
+<command>
 tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER --interface %CLIENTIP
 </command>
 </client>

diff --git a/tests/data/test105 b/tests/data/test105
index 74922d5598681b2efae7631d1ca3c9d24598f7c4..2a26ac7ecafb4beb0ee60616f81c830e7b36686e 100644 (file)
--- a/tests/data/test105
+++ b/tests/data/test105
@@ -27,10 +27,10 @@ REPLY EPSV 500 no such command
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP user+password in URL and ASCII transfer
- </name>
- <command>
+</name>
+<command>
 ftp://userdude:passfellow@%HOSTIP:%FTPPORT/%TESTNUMBER --use-ascii
 </command>
 </client>

diff --git a/tests/data/test1050 b/tests/data/test1050
index 281936bfec0728c6e0fef50d29c1cba0b42bd04c..ff179c637bfd9d4d88508b9c7bd1a0c395f8cbbb 100644 (file)
--- a/tests/data/test1050
+++ b/tests/data/test1050
@@ -35,10 +35,10 @@ ipv6
 <server>
 ftp-ipv6
 </server>
- <name>
+<name>
 FTP-IPv6 dir list, EPRT with specified IP
- </name>
- <command>
+</name>
+<command>
 -g "ftp://%HOST6IP:%FTP6PORT/" -P ::1
 </command>
 # --interface doesn't accept an address surrounded by [] so %CLIENT6IP is out

diff --git a/tests/data/test1051 b/tests/data/test1051
index fab1dbf9571f869a72dbdd2a009908ff3ed25dd9..921aaeb780c100c944daf5f37370433aec484668 100644 (file)
--- a/tests/data/test1051
+++ b/tests/data/test1051
@@ -52,10 +52,10 @@ If this is received, the location following worked
 <server>
 http
 </server>
- <name>
+<name>
 HTTP PUT with Location: following
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -T %LOGDIR/test%TESTNUMBER.txt
 </command>
 <file name="%LOGDIR/test%TESTNUMBER.txt">

diff --git a/tests/data/test1052 b/tests/data/test1052
index 0ae56d033aa739e74b58cf083b8ee649b285a6f1..ade77bde5568891861e693f90d9fa8a4ba90edd9 100644 (file)
--- a/tests/data/test1052
+++ b/tests/data/test1052
@@ -48,10 +48,10 @@ If this is received, the location following worked
 <server>
 http
 </server>
- <name>
+<name>
 HTTP 1.0 PUT with Location: following
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -0 -L -T %LOGDIR/test%TESTNUMBER.txt
 </command>
 <file name="%LOGDIR/test%TESTNUMBER.txt">

diff --git a/tests/data/test1053 b/tests/data/test1053
index e74a70c9dc4dbc47493325d0efe1faf4d0a803c0..30ca83ab2d67df9c72391c541fdca89df8961bd7 100644 (file)
--- a/tests/data/test1053
+++ b/tests/data/test1053
@@ -57,10 +57,10 @@ Mime
 <server>
 http
 </server>
- <name>
+<name>
 HTTP RFC1867-type formposting from file with Location: following
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -L -F name=daniel -F tool=curl -F file=@%LOGDIR/test%TESTNUMBER.txt
 </command>
 # We create this file before the command is invoked!

diff --git a/tests/data/test1054 b/tests/data/test1054
index d972579b908583a268f64ffec06008eb83118bfd..b0425e545c9221bfb36faaf4fef2bfe82e423d16 100644 (file)
--- a/tests/data/test1054
+++ b/tests/data/test1054
@@ -44,13 +44,13 @@ body
 <server>
 http
 </server>
- <name>
+<name>
 HTTP POST from file with 301 redirect and --post301
- </name>
+</name>
 <file name="%LOGDIR/test%TESTNUMBER.txt">
 field=data
 </file>
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d @%LOGDIR/test%TESTNUMBER.txt --post301
 </command>
 </client>

diff --git a/tests/data/test1055 b/tests/data/test1055
index 937068028d4d8fade7ad14050765bfba12eddfd9..2d1c604b4dc0fb285c092847735b5841c0adacfe 100644 (file)
--- a/tests/data/test1055
+++ b/tests/data/test1055
@@ -32,10 +32,10 @@ Connection: close
 http
 ftp
 </server>
- <name>
+<name>
 HTTP PUT Location: redirect to FTP URL
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -L -T %LOGDIR/test%TESTNUMBER.txt
 </command>
 <file name="%LOGDIR/test%TESTNUMBER.txt">

diff --git a/tests/data/test1056 b/tests/data/test1056
index b5e3fd7ebf26d9ecd1a8fcc948f86b5b50a68f65..40879662a33f13ed97686f4a8e7aeb5b737d4f21 100644 (file)
--- a/tests/data/test1056
+++ b/tests/data/test1056
@@ -55,10 +55,10 @@ ipv6
 http
 http-ipv6
 </server>
- <name>
+<name>
 HTTP follow redirect from IPv4 to IPv6 with scope
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
 </command>
 <precheck>

diff --git a/tests/data/test1057 b/tests/data/test1057
index ce3fc0b61f9a43e09346e9f9f472ffef5e641415..a7cb3bc61ef2e1a2d1b8b2dbc4d5dc415f635366 100644 (file)
--- a/tests/data/test1057
+++ b/tests/data/test1057
@@ -26,10 +26,10 @@ Range
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP retrieve a byte-range relative to end of file
- </name>
- <command>
+</name>
+<command>
 -r -12 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1058 b/tests/data/test1058
index ee6c300c10c1fb32d46dce989b8948c2e6dbe3d0..794d2ef22a7f9c48f5ff2a9d1727f3da350c8226 100644 (file)
--- a/tests/data/test1058
+++ b/tests/data/test1058
@@ -29,10 +29,10 @@ in the request
 <server>
 http
 </server>
- <name>
+<name>
 HTTP range relative to end of file
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -r -101
 </command>
 </client>

diff --git a/tests/data/test1059 b/tests/data/test1059
index 95d4b95cde7aeed9cecf623176fba8b048f0a8c6..5da753e59459205c9dd661e35ad7509b037ec431 100644 (file)
--- a/tests/data/test1059
+++ b/tests/data/test1059
@@ -31,10 +31,10 @@ proxy
 <server>
 http
 </server>
- <name>
+<name>
 HTTP CONNECT with proxytunnel to unsupported FTP URL
- </name>
- <command>
+</name>
+<command>
 ftp://test-number:%TESTNUMBER/wanted/page -p -x %HOSTIP:%HTTPPORT
 </command>
 </client>

diff --git a/tests/data/test106 b/tests/data/test106
index 981e9dfa9dd7d5aef589e89e29c5af12c770f86e..b5e1e6929b3aae26f0085ea733c41818f436fe53 100644 (file)
--- a/tests/data/test106
+++ b/tests/data/test106
@@ -25,10 +25,10 @@ works
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP GET with type=A style ASCII URL using %20 codes
- </name>
- <command>
+</name>
+<command>
 "ftp://%HOSTIP:%FTPPORT//path%20with%20%20spaces//and%20things2/%TESTNUMBER;type=A"
 </command>
 </client>

diff --git a/tests/data/test1060 b/tests/data/test1060
index 7eab061e65b3fbba2df8b3a88d1be666d8dd60c9..c1ad6c66768c78ac70d8087230a4726511e9e415 100644 (file)
--- a/tests/data/test1060
+++ b/tests/data/test1060
@@ -871,10 +871,10 @@ http
 crypto
 proxy
 </features>
- <name>
+<name>
 HTTP proxy CONNECT auth Digest, large headers and data
- </name>
- <command>
+</name>
+<command>
 http://test.remote.haxx.se.%TESTNUMBER:8990/path/%TESTNUMBER0002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
 </command>
 </client>

diff --git a/tests/data/test1061 b/tests/data/test1061
index c7fcedbc9f58a457b8af3697bdfe9e4d94ac17f4..76241142c92fc6f3de344c7a377e72f998c3cdbc 100644 (file)
--- a/tests/data/test1061
+++ b/tests/data/test1061
@@ -876,10 +876,10 @@ http
 crypto
 proxy
 </features>
- <name>
+<name>
 HTTP proxy CONNECT auth Digest, large headers and chunked data
- </name>
- <command>
+</name>
+<command>
 http://test.remote.haxx.se.%TESTNUMBER:8990/path/%TESTNUMBER0002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
 </command>
 </client>

diff --git a/tests/data/test1062 b/tests/data/test1062
index df72e6622318ed9aa86d381f012056f937cc6524..31a27a9473b0fa26ea7502328d29217766777332 100644 (file)
--- a/tests/data/test1062
+++ b/tests/data/test1062
@@ -24,10 +24,10 @@ REPLY CWD 250-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP with excessively long server command response lines, boundary condition
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1063 b/tests/data/test1063
index 8f263c8131f08fe2111b4fd11af850a6ef474496..fcbc4b883fde6df96cc67493a7996d99d70f1512 100644 (file)
--- a/tests/data/test1063
+++ b/tests/data/test1063
@@ -22,12 +22,12 @@ none
 file
 large_file
 </features>
- <name>
+<name>
 Invalid large X- range on a file://
- </name>
+</name>
 # This range value is 2**32+7, which will be truncated to the valid value 7
 # if the large file support is not working correctly
- <command>
+<command>
 -r 4294967303- file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt
 </command>
 <file name="%LOGDIR/test%TESTNUMBER.txt">

diff --git a/tests/data/test1064 b/tests/data/test1064
index 298486616b3cc894f9a2060ec022e941e0d29c60..55eeb38dac4a00143145395ff762acc9493d1ff7 100644 (file)
--- a/tests/data/test1064
+++ b/tests/data/test1064
@@ -31,10 +31,10 @@ still ok
 <server>
 http
 </server>
- <name>
+<name>
 HTTP PUT twice
- </name>
- <command>
+</name>
+<command>
 -H "Expect:" -T %LOGDIR/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload1 -T %LOGDIR/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002.upload2
 </command>
 <file name="%LOGDIR/%TESTNUMBER">

diff --git a/tests/data/test1065 b/tests/data/test1065
index bd4be888f6821e8a2467379cae9a15a622ecae05..3b1c652b585e688cf761f7374fb5f01f66e68962 100644 (file)
--- a/tests/data/test1065
+++ b/tests/data/test1065
@@ -32,10 +32,10 @@ still ok
 <server>
 http
 </server>
- <name>
+<name>
 HTTP PUT with one file but two URLs
- </name>
- <command>
+</name>
+<command>
 -H "Expect:" -T %LOGDIR/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload1 http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002.url2
 </command>
 <file name="%LOGDIR/%TESTNUMBER">

diff --git a/tests/data/test1066 b/tests/data/test1066
index 1fbd7dc08ce8c3a64c57414c2b40c2e832b5c393..5b2b178f096964998a896e1ad736aba649b2343f 100644 (file)
--- a/tests/data/test1066
+++ b/tests/data/test1066
@@ -31,10 +31,10 @@ second
 <server>
 http
 </server>
- <name>
+<name>
 HTTP --dump-header - with two URLs
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER0001 --dump-header -
 </command>
 </client>

diff --git a/tests/data/test1067 b/tests/data/test1067
index e5023f58f1f854fd3e9db584352e3698257ce226..8bb2233e36e51d33caa591f050d1b077d58a593f 100644 (file)
--- a/tests/data/test1067
+++ b/tests/data/test1067
@@ -49,10 +49,10 @@ If this is received, the location following worked
 <server>
 http
 </server>
- <name>
+<name>
 HTTP Location: following with auto-referer
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER --silent --location --referer "firstone.html;auto" --write-out "%{stderr}|%{referer}|"
 </command>
 </client>

diff --git a/tests/data/test1068 b/tests/data/test1068
index bf3ae4ee011760d80a11038142af71c282bf10ed..982385400ed624ab7e96d7b9853d575192dd1bc3 100644 (file)
--- a/tests/data/test1068
+++ b/tests/data/test1068
@@ -28,7 +28,7 @@ http
 <name>
 HTTP PUT from stdin
 </name>
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/bzz/%TESTNUMBER -T -
 </command>
 <stdin>

diff --git a/tests/data/test1069 b/tests/data/test1069
index 2eb665922143493b41c966ee6090cea95f413990..51569418336afa736be284968e56c5a52206ab0f 100644 (file)
--- a/tests/data/test1069
+++ b/tests/data/test1069
@@ -19,7 +19,7 @@ http
 <name>
 HTTP 1.0 PUT from stdin with no content length
 </name>
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/bzz/%TESTNUMBER -T - -0
 </command>
 <stdin>

diff --git a/tests/data/test107 b/tests/data/test107
index 5feffac412f5a1f315c337dbeb768406c04fc636..a741b7667f8b6c20e450b99ae5896717a65b6d3e 100644 (file)
--- a/tests/data/test107
+++ b/tests/data/test107
@@ -12,9 +12,9 @@ STOR
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP PASV upload file
- </name>
+</name>
 <file name="%LOGDIR/test%TESTNUMBER.txt">
 data
     to
@@ -23,7 +23,7 @@ that FTP
 works
   so does it?
 </file>
- <command>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt
 </command>
 </client>

diff --git a/tests/data/test1070 b/tests/data/test1070
index ce88a1f0487a4d97e105ae55a3c556be01bfb54e..1f5d6cf94d67ec7b5c14cf31b93242ddec9da016 100644 (file)
--- a/tests/data/test1070
+++ b/tests/data/test1070
@@ -28,10 +28,10 @@ skip: 2300
 <server>
 http
 </server>
- <name>
+<name>
 HTTP POST with server closing connection before (all) data is received
- </name>
- <command>
+</name>
+<command>
  -d @%LOGDIR/input%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H "Expect: 100-continue"
 </command>
 <file name="%LOGDIR/input%TESTNUMBER">

diff --git a/tests/data/test1071 b/tests/data/test1071
index 568471eafaccc84665862a9ca7ebd6d3888efd34..180c467b1cce2694145c0c69d7f81c980be6ecde 100644 (file)
--- a/tests/data/test1071
+++ b/tests/data/test1071
@@ -69,10 +69,10 @@ http
 !SSPI
 crypto
 </features>
- <name>
+<name>
 Downgraded HTTP PUT to HTTP 1.0 with authorization
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/put%TESTNUMBER -u testuser:testpass --anyauth
 </command>
 <file name="%LOGDIR/put%TESTNUMBER">

diff --git a/tests/data/test1072 b/tests/data/test1072
index c0d4c18d4a626271a09ee68fcf1a0e3020784ae0..f0390fb7f3cb5b3f1d65d72a58d520a639e89c84 100644 (file)
--- a/tests/data/test1072
+++ b/tests/data/test1072
@@ -36,10 +36,10 @@ http
 <features>
 crypto
 </features>
- <name>
+<name>
 HTTP chunked PUT to HTTP 1.0 server with authorization
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T - -u testuser:testpass --anyauth
 </command>
 <stdin>

diff --git a/tests/data/test1073 b/tests/data/test1073
index 3f6d70317829a8752d2a05c0696c72506ca0a392..2bc40f057778be9a6d7376d731a675fe8a656c58 100644 (file)
--- a/tests/data/test1073
+++ b/tests/data/test1073
@@ -30,10 +30,10 @@ Connection: close
 <server>
 http
 </server>
- <name>
+<name>
 HTTP chunked PUT to HTTP 1.0 server with redirect
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T - -L
 </command>
 <stdin>

diff --git a/tests/data/test1074 b/tests/data/test1074
index 08ff5076a7b120f395e6253f8ae285830f7591aa..183d51a571d0321dbad4e3bfbe998a8cded126ca 100644 (file)
--- a/tests/data/test1074
+++ b/tests/data/test1074
@@ -36,10 +36,10 @@ wait 1
 <server>
 http
 </server>
- <name>
+<name>
 HTTP downgrade to HTTP/1.0 on second request
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/wantmore/%TESTNUMBER0001
 </command>
 </client>

diff --git a/tests/data/test1075 b/tests/data/test1075
index 2dac5bf98659de55dd025bc1f8d9be82b2f0110f..15d92988c8b140d10e3f3077f85c66c44a2f8e86 100644 (file)
--- a/tests/data/test1075
+++ b/tests/data/test1075
@@ -48,10 +48,10 @@ Content-Length: 0
 <server>
 http
 </server>
- <name>
+<name>
 HTTP PUT with --anyauth authorization (picking Basic)
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/put%TESTNUMBER -u testuser:testpass --anyauth
 </command>
 <file name="%LOGDIR/put%TESTNUMBER">

diff --git a/tests/data/test1076 b/tests/data/test1076
index 017a7d11e547b72becb7262a10d7891a3c50563c..258d14e6a8fd3cafbc5ae27d39c0217269649fee 100644 (file)
--- a/tests/data/test1076
+++ b/tests/data/test1076
@@ -45,10 +45,10 @@ body
 <server>
 http
 </server>
- <name>
+<name>
 HTTP POST with 302 redirect and --post302
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d "moo" --post302
 </command>
 </client>

diff --git a/tests/data/test1077 b/tests/data/test1077
index 28af6e9787be803596fec4236a849f0f4f3b6404..5162eb3420a6f2ecc2e2f030b7e1211be31e9e59 100644 (file)
--- a/tests/data/test1077
+++ b/tests/data/test1077
@@ -46,10 +46,10 @@ http
 ftp
 proxy
 </features>
- <name>
+<name>
 FTP over HTTP proxy with downgrade to HTTP 1.0
- </name>
- <command>
+</name>
+<command>
 -x %HOSTIP:%HTTPPORT ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER0002
 </command>
 </client>

diff --git a/tests/data/test1078 b/tests/data/test1078
index 2e1defac3b13f12f4c1e04d9d660492fa505bc53..97b30853fc0c9c7869ee5c1f2c3fcadfd3b848d3 100644 (file)
--- a/tests/data/test1078
+++ b/tests/data/test1078
@@ -39,10 +39,10 @@ contents
 http
 http-proxy
 </server>
- <name>
+<name>
 HTTP 1.0 CONNECT with proxytunnel and downgrade GET to HTTP/1.0
- </name>
- <command>
+</name>
+<command>
 --proxy1.0 %HOSTIP:%PROXYPORT -p http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER
 </command>
 <features>

diff --git a/tests/data/test1079 b/tests/data/test1079
index 361c4bd0d6a001243865815d6d8e44d9e9bcd594..180c48316e73a4fd2980f016763abffaa0bd8300 100644 (file)
--- a/tests/data/test1079
+++ b/tests/data/test1079
@@ -45,10 +45,10 @@ http
 !SSPI
 crypto
 </features>
- <name>
+<name>
 HTTP retry after closed connection and empty response
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
 </command>
 </client>

diff --git a/tests/data/test108 b/tests/data/test108
index 7efc748d4106910c17a5b75d0fa513898ce063fb..20ef6577ed5bd360cffef0d0db9d713780f390e7 100644 (file)
--- a/tests/data/test108
+++ b/tests/data/test108
@@ -17,10 +17,10 @@ STOR
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP PORT upload with CWD
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/CWD/STOR/RETR/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -P -
 </command>
 <file name="%LOGDIR/upload%TESTNUMBER">

diff --git a/tests/data/test1080 b/tests/data/test1080
index bc7249a93010fe62d3c13db51aec0b6cae7dfcd9..6b9dd5a136ddad88f7f6488ae019b62d47112c56 100644 (file)
--- a/tests/data/test1080
+++ b/tests/data/test1080
@@ -26,10 +26,10 @@ This server reply is for testing a simple Location: following
 <server>
 http
 </server>
- <name>
+<name>
 HTTP Location: on two URLs 'redirect_url' check
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w '%{redirect_url}\n'
 </command>
 </client>

diff --git a/tests/data/test1081 b/tests/data/test1081
index 9f5a192e7e2242117c8b1c3380da26f4ad37f08b..557be4fe65a364c67ca97863c280336b3590d175 100644 (file)
--- a/tests/data/test1081
+++ b/tests/data/test1081
@@ -34,10 +34,10 @@ This second URL does not have a location
 <server>
 http
 </server>
- <name>
+<name>
 HTTP no Location: on second URL 'redirect_url' check
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER0002 -w '%{redirect_url}\n'
 </command>
 </client>

diff --git a/tests/data/test1082 b/tests/data/test1082
index d4dd0e9b5f2aa6b13bef73118a0accb2e6d38a0e..606df1c86b76d5be0c700eb7992ea6740e931e47 100644 (file)
--- a/tests/data/test1082
+++ b/tests/data/test1082
@@ -28,10 +28,10 @@ Content-Type: text/plain
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with localhost --interface
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -4 --interface 127.0.0.1
 </command>
 <precheck>

diff --git a/tests/data/test1083 b/tests/data/test1083
index d7713b1cf22e87e90d1d7b288664d9889186f8df..8728d61832efd8bb9787bcf8ed3fbb98e64558e6 100644 (file)
--- a/tests/data/test1083
+++ b/tests/data/test1083
@@ -32,10 +32,10 @@ ipv6
 <server>
 http-ipv6
 </server>
- <name>
+<name>
 HTTP-IPv6 GET with ip6-localhost --interface
- </name>
- <command>
+</name>
+<command>
 -g "http://%HOST6IP:%HTTP6PORT/%TESTNUMBER" --interface ip6-localhost
 </command>
 <precheck>

diff --git a/tests/data/test1084 b/tests/data/test1084
index 7a6292b88a2340c4e5a9f924d2e2387e410020bf..1e311a8b157d2ddca1e75ea4b5378f96bc3cb4d2 100644 (file)
--- a/tests/data/test1084
+++ b/tests/data/test1084
@@ -23,10 +23,10 @@ http
 <server>
 none
 </server>
- <name>
+<name>
 HTTP GET with invalid --interface
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER --interface non-existing-host.haxx.se.
 </command>
 </client>

diff --git a/tests/data/test1085 b/tests/data/test1085
index 582fdb085fad07426cad242aef57c38f0a629cc2..b63b0f033bdab0fdf56406d44382e6e572ee5188 100644 (file)
--- a/tests/data/test1085
+++ b/tests/data/test1085
@@ -25,10 +25,10 @@ ipv6
 <server>
 none
 </server>
- <name>
+<name>
 HTTP-IPv6 GET with invalid --interface
- </name>
- <command>
+</name>
+<command>
 -g "http://%HOST6IP:%NOLISTENPORT/%TESTNUMBER" --interface non-existing-host.haxx.se.
 </command>
 # Ensure the IPv6 stack is operational before running this test (other tests

diff --git a/tests/data/test1086 b/tests/data/test1086
index 0bb309bea9f490a0826c5cfbe90c8630183410c6..0b4b875d9eb7e7e547f5f860cf40abf880f2d15c 100644 (file)
--- a/tests/data/test1086
+++ b/tests/data/test1086
@@ -86,10 +86,10 @@ ftp
 <killserver>
 ftp
 </killserver>
- <name>
+<name>
 FTP download with strict timeout and slow data transfer
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -m 7
 </command>
 </client>

diff --git a/tests/data/test1087 b/tests/data/test1087
index b084c9b6498ce4fae3f4ca06fb6e3b80abd29fe5..f28b62106fdf5c1a9244df94e0dbb93c3ad8cb2f 100644 (file)
--- a/tests/data/test1087
+++ b/tests/data/test1087
@@ -74,10 +74,10 @@ contents
 <server>
 http
 </server>
- <name>
+<name>
 HTTP, proxy with --anyauth and Location: to new host
- </name>
- <command>
+</name>
+<command>
 http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 -x %HOSTIP:%HTTPPORT --user iam:myself --location --anyauth
 </command>
 <features>

diff --git a/tests/data/test1088 b/tests/data/test1088
index 9f12f25ab2a507a320a47cc309914e5ad79c7e11..e5ae3c2c1112d67236057fc92592f7ca2cc1eb68 100644 (file)
--- a/tests/data/test1088
+++ b/tests/data/test1088
@@ -75,10 +75,10 @@ contents
 <server>
 http
 </server>
- <name>
+<name>
 HTTP, proxy with --anyauth and Location: to new host using location-trusted
- </name>
- <command>
+</name>
+<command>
 http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 -x %HOSTIP:%HTTPPORT --user iam:myself --location-trusted --anyauth
 </command>
 <features>

diff --git a/tests/data/test1089 b/tests/data/test1089
index c8c5307aa3cd1a916c1432c21603dea221aafb26..c36f21cbbe0929bd79325c4e53292acca65d307d 100644 (file)
--- a/tests/data/test1089
+++ b/tests/data/test1089
@@ -39,10 +39,10 @@ bigger monster
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET --write-out with redirected fetch
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n%{num_redirects}\n%{size_download}\n%{url_effective}\n%{content_type}\n%{response_code}\n" -L
 </command>
 </client>

diff --git a/tests/data/test109 b/tests/data/test109
index baab37b30ffcf9e6e08d185a32dc2ff036449d90..d466437f21355cd9517f0c66d0c010e8e7137eea 100644 (file)
--- a/tests/data/test109
+++ b/tests/data/test109
@@ -17,10 +17,10 @@ APPE
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP PASV upload append
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER --append
 </command>
 <file name="%LOGDIR/upload%TESTNUMBER">

diff --git a/tests/data/test1090 b/tests/data/test1090
index 0551519fb4e4219548ff0d70d9b29332d6ff67f1..ffd81bc610bb0c963eaf619c7520e0d039f6a177 100644 (file)
--- a/tests/data/test1090
+++ b/tests/data/test1090
@@ -46,10 +46,10 @@ monster
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET --write-out with redirected fetch and chunked reply
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n%{num_redirects}\n%{size_download}\n%{url_effective}\n%{content_type}\n%{response_code}\n" -L
 </command>
 </client>

diff --git a/tests/data/test1091 b/tests/data/test1091
index 788f2dc27ac6c5f8b5616745dd0b2ece75f40357..445d31655f73ef5f448f7dbacb8a4a870f2684c8 100644 (file)
--- a/tests/data/test1091
+++ b/tests/data/test1091
@@ -20,10 +20,10 @@ bla bla bla
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP URL with type=i
- </name>
- <command>
+</name>
+<command>
 "ftp://%HOSTIP:%FTPPORT/%2ftmp/moo/%TESTNUMBER;type=i" --use-ascii
 </command>
 </client>

diff --git a/tests/data/test1092 b/tests/data/test1092
index 1c3c4696fb25c602902ca4e19cff65abe959e0bb..3d7b741ea7466d15092acb737c02b0614805b9a7 100644 (file)
--- a/tests/data/test1092
+++ b/tests/data/test1092
@@ -32,10 +32,10 @@ http
 ftp
 proxy
 </features>
- <name>
+<name>
 FTP with type=i over HTTP proxy
- </name>
- <command>
+</name>
+<command>
 "ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER;type=i" --use-ascii -x %HOSTIP:%HTTPPORT
 </command>
 </client>

diff --git a/tests/data/test1093 b/tests/data/test1093
index 3d903412e22b779510a23b4e5aae06a2c7e26f2a..1bed99bec18f44973d6758897668805eb4f9b515 100644 (file)
--- a/tests/data/test1093
+++ b/tests/data/test1093
@@ -24,10 +24,10 @@ returned
 <server>
 tftp
 </server>
- <name>
+<name>
 TFTP retrieve with mode=i
- </name>
- <command>
+</name>
+<command>
 "tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER;mode=i" --use-ascii
 </command>
 </client>

diff --git a/tests/data/test1094 b/tests/data/test1094
index 1b2a58591959d1b4b7b34e74cc560b4ffb552016..ec1728976bdc410a0430580bab97315f5910af6e 100644 (file)
--- a/tests/data/test1094
+++ b/tests/data/test1094
@@ -30,10 +30,10 @@ returned
 <server>
 tftp
 </server>
- <name>
+<name>
 TFTP retrieve with mode=netascii
- </name>
- <command>
+</name>
+<command>
 "tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER;mode=netascii"
 </command>
 </client>

diff --git a/tests/data/test1095 b/tests/data/test1095
index d4cc082d10c0f54f91fb51709c81fe7b9110d792..8480c8a473f55b196aaf3c1061f228cfac7bef55 100644 (file)
--- a/tests/data/test1095
+++ b/tests/data/test1095
@@ -55,10 +55,10 @@ http
 !SSPI
 crypto
 </features>
- <name>
+<name>
 HTTP with Digest and realm with quoted quotes
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
 </command>
 </client>

diff --git a/tests/data/test1096 b/tests/data/test1096
index 3ab30ab8a19c28ef1e58436360383a648b264d90..e7b16392473d1c30a96913f1c1e5ad424202aff0 100644 (file)
--- a/tests/data/test1096
+++ b/tests/data/test1096
@@ -20,10 +20,10 @@ REPLY SIZE 500 command not understood
 <server>
 ftp
 </server>
- <name>
+<name>
 Two FTP downloads, with failed RETR but reused control connection
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/dir/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/dir/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1097 b/tests/data/test1097
index 5a73e89b437713c7b6d974b75b2c4a4d7f80f8e5..106a8537b879e3296209ac4850658f3073f21850 100644 (file)
--- a/tests/data/test1097
+++ b/tests/data/test1097
@@ -49,10 +49,10 @@ SSL
 !SSPI
 proxy
 </features>
- <name>
+<name>
 HTTP POST using CONNECT with --proxy-ntlm but no auth is required
- </name>
- <command>
+</name>
+<command>
 http://test.a.galaxy.far.far.away.%TESTNUMBER:%HTTPPORT/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-ntlm -d "dummy=value" -p
 </command>
 </client>

diff --git a/tests/data/test1098 b/tests/data/test1098
index 8e31c32b66f89c4986138f8932a3843273f59e52..dac208949aca7e6611687a5002bf02572b970a63 100644 (file)
--- a/tests/data/test1098
+++ b/tests/data/test1098
@@ -31,11 +31,11 @@ http
 ftp
 proxy
 </features>
- <name>
+<name>
 FTP RETR twice over proxy confirming persistent connection
- </name>
+</name>
 
- <command>
+<command>
 ftp://ftp-site/moo/%TESTNUMBER ftp://ftp-site/moo/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT
 </command>
 </client>

diff --git a/tests/data/test1099 b/tests/data/test1099
index 34cd99129d1bf8d27569b7923a746cecf8b7960d..2a97f6863b966ddac8b23b15a1186a608fe69859 100644 (file)
--- a/tests/data/test1099
+++ b/tests/data/test1099
@@ -19,10 +19,10 @@ data for %TESTNUMBER
 <server>
 tftp
 </server>
- <name>
+<name>
 TFTP get first a non-existing file then an existing
- </name>
- <command>
+</name>
+<command>
 tftp://%HOSTIP:%TFTPPORT/an/invalid-file tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test11 b/tests/data/test11
index 89844ea1468ac9567832af80729a7b6b0208322f..5affc6bde28d24855856d63edfda01542cf4a6e4 100644 (file)
--- a/tests/data/test11
+++ b/tests/data/test11
@@ -49,10 +49,10 @@ If this is received, the location following worked
 <server>
 http
 </server>
- <name>
+<name>
 simple HTTP Location: following
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L
 </command>
 </client>

diff --git a/tests/data/test110 b/tests/data/test110
index 6c892ed2a58e7411dbdfcdd521387395e81e0556..e53fcd1377afdad03a1d6e323652bd8294d07049 100644 (file)
--- a/tests/data/test110
+++ b/tests/data/test110
@@ -26,10 +26,10 @@ REPLY EPSV 500 no such command
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP download resume with set limit
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C 20
 </command>
 </client>

diff --git a/tests/data/test1100 b/tests/data/test1100
index 774cc9a80ff112df9a82ad39767fa68429953d8e..1148a79f75c8945150f68dcbbb287f3278e45ff4 100644 (file)
--- a/tests/data/test1100
+++ b/tests/data/test1100
@@ -70,16 +70,16 @@ debug
 <server>
 http
 </server>
- <name>
+<name>
 HTTP POST with NTLM authorization and following a 302 redirect
- </name>
+</name>
  <setenv>
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm -L -d "stuff to send away"
 </command>
 <precheck>

diff --git a/tests/data/test1101 b/tests/data/test1101
index f7e504f910e9b753453a3b4b0f0367938e3bc837..02aced8ce449df65724fa650c5c5c960090241bd 100644 (file)
--- a/tests/data/test1101
+++ b/tests/data/test1101
@@ -25,15 +25,15 @@ boo
 <server>
 http
 </server>
- <name>
+<name>
 NO_PROXY test, with user name in URL
- </name>
+</name>
 
 <setenv>
 no_proxy=%HOSTIP
 http_proxy=http://non-existing-host.haxx.se:3128/
 </setenv>
- <command>
+<command>
 http://user:secret@%HOSTIP:%HTTPPORT/gimme/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1102 b/tests/data/test1102
index c2fd03438fb3c1f440449d43eba4fe670e1a8119..16994d953340b9c35b498983ad8ce3700afefd86 100644 (file)
--- a/tests/data/test1102
+++ b/tests/data/test1102
@@ -24,10 +24,10 @@ REPLY SITE 250 Name format set to 1
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP OS/400 server name format check
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1103 b/tests/data/test1103
index 4624c9d21695326447efc28d8681a5207bb4405b..a53b504bdc071d47207b6e353b4a74edd35dd589 100644 (file)
--- a/tests/data/test1103
+++ b/tests/data/test1103
@@ -23,10 +23,10 @@ REPLY SYST 215  unknown-OS runs this server
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP non-OS/400 server
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1104 b/tests/data/test1104
index b77c557683fe976a3ef8784adec8c30626982b81..9c5d659bc3373d599fe6ef6c43493ebe80c953e7 100644 (file)
--- a/tests/data/test1104
+++ b/tests/data/test1104
@@ -55,10 +55,10 @@ If this is received, the location following worked
 <server>
 http
 </server>
- <name>
+<name>
 HTTP cookie expiry date at Jan 1 00:00:00 GMT 1970
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -x %HOSTIP:%HTTPPORT -c %LOGDIR/cookies%TESTNUMBER.jar
 </command>
 <features>

diff --git a/tests/data/test1105 b/tests/data/test1105
index 6434ab2e4079ffc96d73a9c8bd24caa8833277c5..afe621bb0d10cd664ef543bdacb2f2bc3a2db3db 100644 (file)
--- a/tests/data/test1105
+++ b/tests/data/test1105
@@ -31,10 +31,10 @@ Set-Cookie: bar=foo bar
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with cookie parser and header recording
- </name>
- <command>
+</name>
+<command>
 "http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER?parm1=this*that/other/thing&parm2=foobar/%TESTNUMBER" -c %LOGDIR/cookie%TESTNUMBER.txt -d "userid=myname&password=mypassword"
 </command>
 <precheck>

diff --git a/tests/data/test1106 b/tests/data/test1106
index f6e589302a7173c7e75b156e389992dd2756dada..e3acdac16be5ffdea0a8d4c2137ce9caaeb80a5d 100644 (file)
--- a/tests/data/test1106
+++ b/tests/data/test1106
@@ -29,14 +29,14 @@ proxy
 <server>
 http
 </server>
- <name>
+<name>
 FTP URL and with ftp_proxy environment variable set
- </name>
+</name>
 
 <setenv>
 ftp_proxy=http://%HOSTIP:%HTTPPORT/
 </setenv>
- <command>
+<command>
 ftp://%HOSTIP:23456/%TESTNUMBER
 </command>
 

diff --git a/tests/data/test1107 b/tests/data/test1107
index 4946e893767964a084b873fe9ef804d9d59455eb..8b31c76f839770a2f08887361d8b032162fbb24c 100644 (file)
--- a/tests/data/test1107
+++ b/tests/data/test1107
@@ -27,10 +27,10 @@ REPLY PRET 200 fine
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP RETR PASV with PRET
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-pret
 </command>
 

diff --git a/tests/data/test1108 b/tests/data/test1108
index 3667b118b40b59abf5ee7a1fd779cc8baabc0163..c6008af300594bfa7e60acf5fff64ce5dc192d49 100644 (file)
--- a/tests/data/test1108
+++ b/tests/data/test1108
@@ -20,10 +20,10 @@ REPLY PRET 550 unknown command
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP RETR PASV with PRET not supported
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-pret
 </command>
 

diff --git a/tests/data/test1109 b/tests/data/test1109
index eb209a5d6a9e841d0d4bce9a64305fd487c1b623..93aa9e4dbce9972b50a83b93c5a7a3396e0c31a6 100644 (file)
--- a/tests/data/test1109
+++ b/tests/data/test1109
@@ -22,10 +22,10 @@ hello
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with URL that contains fragment after the path
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER#test
 </command>
 </client>

diff --git a/tests/data/test111 b/tests/data/test111
index 25df3aee509f15a7d600a0b7a832622f73afef34..a46f7aef1d24b1128d87fc51beef957dbe1fc7de 100644 (file)
--- a/tests/data/test111
+++ b/tests/data/test111
@@ -19,10 +19,10 @@ FAILURE
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP download resume beyond file size
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C 2000
 </command>
 </client>

diff --git a/tests/data/test1110 b/tests/data/test1110
index a363fef9cad36e12624f7ff05a7dde9e9f0ff069..165a8acd86211266f92a70df8a765eda7121a76a 100644 (file)
--- a/tests/data/test1110
+++ b/tests/data/test1110
@@ -23,10 +23,10 @@ hello
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with URL that contains a fragment after the query part
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER?q=foobar#fragment
 </command>
 </client>

diff --git a/tests/data/test1111 b/tests/data/test1111
index 1e9203a45c43ee229cf865ef7adc8b2aa47f4163..157cd2751cbe2edae76cc57959a09b38c657a51e 100644 (file)
--- a/tests/data/test1111
+++ b/tests/data/test1111
@@ -23,10 +23,10 @@ hello
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with URL whose fragment contains a # (which is illegal)
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER?q=foobar#fragment#fragment2
 </command>
 </client>

diff --git a/tests/data/test1112 b/tests/data/test1112
index e97392009e526cefa58566a9cc97b48742edc55f..b0a6106605255c164faa0c542b2892327a542277 100644 (file)
--- a/tests/data/test1112
+++ b/tests/data/test1112
@@ -89,10 +89,10 @@ ftps
 <killserver>
 ftps
 </killserver>
- <name>
+<name>
 FTPS download with strict timeout and slow data transfer
- </name>
- <command>
+</name>
+<command>
 -k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/%TESTNUMBER -m 16
 </command>
 </client>

diff --git a/tests/data/test1114 b/tests/data/test1114
index 573eda4d2ff04dd80a6fec4d8c3956afef6b9396..e8a87ab11eca11b47ac92251354b111606fa929d 100644 (file)
--- a/tests/data/test1114
+++ b/tests/data/test1114
@@ -21,10 +21,10 @@ ftp
 <tool>
 lib576
 </tool>
- <name>
+<name>
 FTP wildcard download - skip/parser_correctness/CURLOPT_FNMATCH_FUNCTION (DOS)
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/fully_simulated/DOS/*
 </command>
 </client>

diff --git a/tests/data/test1115 b/tests/data/test1115
index f14182c87d693fa8c14ad4baeba5990ea670e07a..40ce7c15e19a36bb1d27c0f5f1b1bcc57951d33b 100644 (file)
--- a/tests/data/test1115
+++ b/tests/data/test1115
@@ -29,10 +29,10 @@ Content-Length: 0
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with unexpected 1xx response
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1116 b/tests/data/test1116
index b106c074ddffc691103a84b3df391d85f076a172..af323fad684629ff62488d88b2bdebdfcb1d2fdb 100644 (file)
--- a/tests/data/test1116
+++ b/tests/data/test1116
@@ -53,10 +53,10 @@ writedelay: 10
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with chunked trailer without Trailer:
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1117 b/tests/data/test1117
index b2b5a3b1730e889ab1ba51a1469274165cfc454b..4399d7d21fd9787cc83076a2b717f5d56d01bf76 100644 (file)
--- a/tests/data/test1117
+++ b/tests/data/test1117
@@ -41,10 +41,10 @@ writedelay: 1000
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with invalid range then another URL
- </name>
- <command>
+</name>
+<command>
 -r 10-22 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/wantmore/%TESTNUMBER0001
 </command>
 </client>

diff --git a/tests/data/test1118 b/tests/data/test1118
index 9024e0864b74801f805d507d7325d7ee944da043..3daa8a63e7d0009ed15a9210289ecef07681ce6b 100644 (file)
--- a/tests/data/test1118
+++ b/tests/data/test1118
@@ -31,10 +31,10 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 URL without slash and @-letter in query
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT?email=name@example.com/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1119 b/tests/data/test1119
index 2f1b54c23c990dbb5cee483faaab585aaa13e472..41f6dba2c16ca559e20d486655071d232b0d4ff9 100644 (file)
--- a/tests/data/test1119
+++ b/tests/data/test1119
@@ -13,9 +13,9 @@ symbols-in-versions
 none
 </server>
 
- <name>
+<name>
 Verify that symbols-in-versions and headers are in sync
- </name>
+</name>
 
 <command type="perl">
 %SRCDIR/symbol-scan.pl %SRCDIR/.. ../include/curl

diff --git a/tests/data/test112 b/tests/data/test112
index c48506c366fded9f049fb39f53ef15283307389f..41bbc025d9602c30b42614f73dd727ccc2fd00d6 100644 (file)
--- a/tests/data/test112
+++ b/tests/data/test112
@@ -16,10 +16,10 @@ Resume
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP PASV upload resume
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -C 40
 </command>
 <file name="%LOGDIR/upload%TESTNUMBER">

diff --git a/tests/data/test1120 b/tests/data/test1120
index 06d0b909dbf8c76cb659bdf6c139daf6aafbc5e0..464b8ac09726e857480c1f1d12396d16308a1b1d 100644 (file)
--- a/tests/data/test1120
+++ b/tests/data/test1120
@@ -21,10 +21,10 @@ REPLY CWD 421 Timeout!
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP with 421 timeout response
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1121 b/tests/data/test1121
index 823a52e7ab757f5416a6c74f65cc8e57b4ee2406..3eec862d6d1fa24a2e36603c5b996c5d240b5a77 100644 (file)
--- a/tests/data/test1121
+++ b/tests/data/test1121
@@ -23,10 +23,10 @@ blaha
 <server>
 http
 </server>
- <name>
+<name>
 HTTP multiple provided Host: headers
- </name>
- <command>
+</name>
+<command>
 -H "Host: host1" -H "Host: host2" -H "Host: host3" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1122 b/tests/data/test1122
index a9f6c434fe7681d7f35410f3c02f1576383a7c29..478bafb3cf4e115bac24b0217b6b4cf83af639fc 100644 (file)
--- a/tests/data/test1122
+++ b/tests/data/test1122
@@ -45,10 +45,10 @@ libz
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET gzip transfer-encoded content
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding
 </command>
 </client>

diff --git a/tests/data/test1123 b/tests/data/test1123
index 036c78d8cd31443f1ac54dc0f83b3c1772b94cd1..bfa8abc0655b164a038ea4ddee183e3321c15b35 100644 (file)
--- a/tests/data/test1123
+++ b/tests/data/test1123
@@ -174,10 +174,10 @@ libz
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET deflate transfer-encoded content
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding
 </command>
 </client>

diff --git a/tests/data/test1124 b/tests/data/test1124
index fc3c9cf69671d05cde66685b142b682adde0ab64..0b198c6383da741042bc4c549647346e027a7b46 100644 (file)
--- a/tests/data/test1124
+++ b/tests/data/test1124
@@ -43,10 +43,10 @@ libz
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET gzip+chunked transfer-encoded content
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding
 </command>
 </client>

diff --git a/tests/data/test1125 b/tests/data/test1125
index 43e00a5f04afdae3e19b1e1d87db2c8cad145a36..62e56e6e70d4e34595d715117106a0d08ac7094e 100644 (file)
--- a/tests/data/test1125
+++ b/tests/data/test1125
@@ -43,10 +43,10 @@ libz
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET transfer-encoding with custom Connection:
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding -H "Connection: close"
 </command>
 </client>

diff --git a/tests/data/test1126 b/tests/data/test1126
index d45f40dad9bf9bd19c0e891ee74616d47e9dfc8d..b25820b0cfa594811592116d2f3aa179f5d70f22 100644 (file)
--- a/tests/data/test1126
+++ b/tests/data/test1126
@@ -27,10 +27,10 @@ Content-Type: text/html
 <server>
 http
 </server>
- <name>
+<name>
 HTTP 200 If-Modified-Since with newer document
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 12:00:00 1999 GMT"
 </command>
 </client>

diff --git a/tests/data/test1127 b/tests/data/test1127
index 968f80bf14651ac9c70a51eebf5fe3cfebe433bb..fa3ee85fe7b03d55a1b01d7f73f1c2d70860b90d 100644 (file)
--- a/tests/data/test1127
+++ b/tests/data/test1127
@@ -36,10 +36,10 @@ Content-Type: text/html
 <server>
 http
 </server>
- <name>
+<name>
 HTTP 200 If-Modified-Since with older document
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 12:00:00 1999 GMT"
 </command>
 </client>

diff --git a/tests/data/test1128 b/tests/data/test1128
index 193ee40dab7e86dc968d6efd591dd87855e2cfaa..37b5b522ed3070c3daa4938c24822da93e27be3d 100644 (file)
--- a/tests/data/test1128
+++ b/tests/data/test1128
@@ -37,10 +37,10 @@ Content-Type: text/html
 <server>
 http
 </server>
- <name>
+<name>
 HTTP 200 If-Modified-Since with old+new documents
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -z "dec 12 12:00:00 1999 GMT"
 </command>
 </client>

diff --git a/tests/data/test1129 b/tests/data/test1129
index b1ee1066b55c822cb66161b013d1c95e6dc54435..a649a38e9d157d28923607b6d3703131207cdeaf 100644 (file)
--- a/tests/data/test1129
+++ b/tests/data/test1129
@@ -47,9 +47,9 @@ skip: 1053700
 <server>
 http
 </server>
- <name>
+<name>
 HTTP POST expect 100-continue with a 404
- </name>
+</name>
  <command option="no-output">
 -d @%LOGDIR/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001
 </command>

diff --git a/tests/data/test113 b/tests/data/test113
index 8264a6f2dda8448be5dbc9875b40aa1cd90bc41c..1c0a8b246c6b9968cb66d5a75957aff2c2383e13 100644 (file)
--- a/tests/data/test113
+++ b/tests/data/test113
@@ -17,10 +17,10 @@ REPLY USER 314 bluah you fewl!
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP download, failed login: USER not valid
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1130 b/tests/data/test1130
index 1107941896198cc42e821078105025f6ce9895ce..133363de1a0aecd3d2af4a0b4fef9fe2d7600db1 100644 (file)
--- a/tests/data/test1130
+++ b/tests/data/test1130
@@ -48,9 +48,9 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 <server>
 http
 </server>
- <name>
+<name>
 HTTP POST forced expect 100-continue with a 404
- </name>
+</name>
  <command option="no-output">
 -d @%LOGDIR/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -H "Expect: 100-continue" --expect100-timeout 999
 </command>

diff --git a/tests/data/test1131 b/tests/data/test1131
index 5725e71eb82ce04aa265b8d9d234b293813dbdae..b5e738802cc8cdf969cd988869bd62671c05fbe2 100644 (file)
--- a/tests/data/test1131
+++ b/tests/data/test1131
@@ -48,9 +48,9 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 <server>
 http
 </server>
- <name>
+<name>
 HTTP PUT expect 100-continue with a 400
- </name>
+</name>
  <command option="no-output">
 -H "Expect: 100-continue" -T %LOGDIR/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 --expect100-timeout 999
 </command>

diff --git a/tests/data/test1132 b/tests/data/test1132
index 8aa643224d23e355aecee0587df3c6e2b0c14e90..613031bac83ddb65538bf1d4acc61a7a57d42f95 100644 (file)
--- a/tests/data/test1132
+++ b/tests/data/test1132
@@ -13,9 +13,9 @@ memory-includes
 none
 </server>
 
- <name>
+<name>
 Verify memory #include files in libcurl's C source files
- </name>
+</name>
 
 <command type="perl">
 %SRCDIR/mem-include-scan.pl %SRCDIR/../lib

diff --git a/tests/data/test1133 b/tests/data/test1133
index 51b6471737dfdb72482812680741fab16c816645..9582fc4d08fb125c86508ce494bd4c70deaf9ac8 100644 (file)
--- a/tests/data/test1133
+++ b/tests/data/test1133
@@ -25,10 +25,10 @@ Mime
 <server>
 http
 </server>
- <name>
+<name>
 HTTP RFC1867-type formposting with filename/data contains ',', ';', '"'
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F "file=@\"%LOGDIR/test%TESTNUMBER,and;.txt\";type=mo/foo;filename=\"faker,and;.txt\"" -F 'file2=@"%LOGDIR/test%TESTNUMBER,and;.txt"' -F 'file3=@"%LOGDIR/test%TESTNUMBER,and;.txt";type=m/f,"%LOGDIR/test%TESTNUMBER,and;.txt"' -F a="{\"field1\":\"value1\",\"field2\":\"value2\"}" -F 'b=" \\value1;type=\"whatever\" "; type=text/foo; charset=utf-8 ; filename=param_b'
 </command>
 # We create this file before the command is invoked!

diff --git a/tests/data/test1134 b/tests/data/test1134
index 199622fe8f4506c1f0633554ca6bcf7b14de3832..09aea52243bb1d1adc6249140789ecc0f476ef90 100644 (file)
--- a/tests/data/test1134
+++ b/tests/data/test1134
@@ -34,10 +34,10 @@ contents2
 <server>
 http
 </server>
- <name>
+<name>
 HTTP connection reuse with different credentials
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u user1:password1 --next http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -u 2user:password2
 </command>
 </client>

diff --git a/tests/data/test1135 b/tests/data/test1135
index 17191feba3a0387ec8a636f54a9622986ce79d3c..d188989ed6c44cbf4138aa26bd3d3bc8b0b7095e 100644 (file)
--- a/tests/data/test1135
+++ b/tests/data/test1135
@@ -17,9 +17,9 @@ none
 # the build. We break binary compatibility by changing order. Only add
 # new entries last or bump the SONAME.
 #
- <name>
+<name>
 Verify CURL_EXTERN order
- </name>
+</name>
 
 <command type="perl">
 %SRCDIR/extern-scan.pl %SRCDIR/..

diff --git a/tests/data/test1137 b/tests/data/test1137
index aa37325a77adb6546efec8e69fec34939068ce6b..cb20aee313ec9a065f566eb421f5049570addd9a 100644 (file)
--- a/tests/data/test1137
+++ b/tests/data/test1137
@@ -27,10 +27,10 @@ REPLY EPSV 500 no such command
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP RETR --ignore-content-length
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ignore-content-length
 </command>
 

diff --git a/tests/data/test1138 b/tests/data/test1138
index c982583946e3048af715a6ad43d796c6d49f9e91..9afe8d7fbd4bb994472be694be58d7803758f49b 100644 (file)
--- a/tests/data/test1138
+++ b/tests/data/test1138
@@ -45,10 +45,10 @@ body
 <server>
 http
 </server>
- <name>
+<name>
 HTTP redirect with UTF-8 characters
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
 </command>
 </client>

diff --git a/tests/data/test114 b/tests/data/test114
index 8d8cc86b1907fd5ba588d6af016ef2a5fb18e2e0..8a545f2a85326b1fc01d0a10a7f3f6af3513ad2e 100644 (file)
--- a/tests/data/test114
+++ b/tests/data/test114
@@ -17,10 +17,10 @@ REPLY PASS 314 bluah you f00l!
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP download, failed login: PASS not valid
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1140 b/tests/data/test1140
index f083eec3911f41048abe15691b8bc417ae48ce09..5aa997e78984e77c70f28e18057d739bc6d2f298 100644 (file)
--- a/tests/data/test1140
+++ b/tests/data/test1140
@@ -14,9 +14,9 @@ documentation
 none
 </server>
 
- <name>
+<name>
 Verify the nroff of man pages
- </name>
+</name>
 
 <command type="perl">
 %SRCDIR/nroff-scan.pl %SRCDIR/../docs/ %SRCDIR/../docs/libcurl/*.3 %SRCDIR/../docs/libcurl/opts/*.3 %SRCDIR/../docs/*.1

diff --git a/tests/data/test1141 b/tests/data/test1141
index 97faec45c406e16836e36974f5a15c52d29cf33c..727cbcd5653a6cc06bb7215aee56208d3b49da57 100644 (file)
--- a/tests/data/test1141
+++ b/tests/data/test1141
@@ -41,10 +41,10 @@ hej
 <server>
 http
 </server>
- <name>
+<name>
 HTTP redirect to http:/// (three slashes!)
- </name>
- <command>
+</name>
+<command>
 %HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -x http://%HOSTIP:%HTTPPORT
 </command>
 <features>

diff --git a/tests/data/test1142 b/tests/data/test1142
index b8dc33e475a1ace81c433fc0c31497f49bb9febb..c35190006f5156e3705c2ddc2b1cf2f15e2e6bff 100644 (file)
--- a/tests/data/test1142
+++ b/tests/data/test1142
@@ -36,10 +36,10 @@ Location: http:////foo.example.com/want/%TESTNUMBER0001
 <server>
 http
 </server>
- <name>
+<name>
 HTTP redirect to http://// (four slashes!)
- </name>
- <command>
+</name>
+<command>
 %HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -x http://%HOSTIP:%HTTPPORT
 </command>
 <features>

diff --git a/tests/data/test1143 b/tests/data/test1143
index a3b97402ee562adbe033f04b2830dad7fd112ba4..e9053b179436d0f4541fee153cfd1b98778df02e 100644 (file)
--- a/tests/data/test1143
+++ b/tests/data/test1143
@@ -22,10 +22,10 @@ hej
 <server>
 http
 </server>
- <name>
+<name>
 HTTP URL with http:/ (one slash!)
- </name>
- <command>
+</name>
+<command>
 http:/%HOSTIP:%HTTPPORT/want/%TESTNUMBER
 </command>
 <setenv>

diff --git a/tests/data/test1144 b/tests/data/test1144
index 7e2242be864cd8dddd5178080fcef9666a3cc811..1881a5190bf52697cc8fe9f68ad6f6f97635cd90 100644 (file)
--- a/tests/data/test1144
+++ b/tests/data/test1144
@@ -47,10 +47,10 @@ verify
 <server>
 http
 </server>
- <name>
+<name>
 HTTP HEAD, receive no headers only body
- </name>
- <command>
+</name>
+<command>
 -I http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http0.9
 </command>
 </client>

diff --git a/tests/data/test1147 b/tests/data/test1147
index 81c33a8c88f58314fe38903b2d542834e9a61435..a85aeddb9c77eed017aaf5c5e69a2034f32a6ffa 100644 (file)
--- a/tests/data/test1147
+++ b/tests/data/test1147
@@ -32,9 +32,9 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 Get -H headers from a file
- </name>
+</name>
 <file name="%LOGDIR/heads%TESTNUMBER.txt">
 One: 1
 Two: 2
@@ -45,7 +45,7 @@ no-colon
 %endif
 User-Agent:
 </file>
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H @%LOGDIR/heads%TESTNUMBER.txt
 </command>
 </client>

diff --git a/tests/data/test1148 b/tests/data/test1148
index dbd25921a6503a6f6c40d215c66bb9c2bf2e6a1d..f5333534a025c869edcceeb2c4936af2383cbbe7 100644 (file)
--- a/tests/data/test1148
+++ b/tests/data/test1148
@@ -31,10 +31,10 @@ zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz
 <server>
 http
 </server>
- <name>
+<name>
 progress-bar
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -# --stderr %LOGDIR/stderrlog%TESTNUMBER
 </command>
 <setenv>

diff --git a/tests/data/test1149 b/tests/data/test1149
index ac4d1c10f945c9faa03ebd92da05c1bf2e02ef9d..7686ef10b981990e45f3df7ae523a01ab3be17f3 100644 (file)
--- a/tests/data/test1149
+++ b/tests/data/test1149
@@ -33,10 +33,10 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP dir list multicwd then again nocwd
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/list/this/path/%TESTNUMBER/ --ftp-method multicwd --next ftp://%HOSTIP:%FTPPORT/list/this/path/%TESTNUMBER/ --ftp-method nocwd
 </command>
 </client>

diff --git a/tests/data/test115 b/tests/data/test115
index 869027884d4afc3e6a571f208ebd57cb93ae1341..22f75c0b6e8113d8f36d172d1810e6fb016dd242 100644 (file)
--- a/tests/data/test115
+++ b/tests/data/test115
@@ -19,10 +19,10 @@ REPLY EPSV 314 bluah you f00l!
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP download, failed PASV
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1150 b/tests/data/test1150
index 6a07b73dfb42b80375d72f978f8e1f9e5dc112ec..cafc00cd075998863b02a7877bcceb6e581ad54a 100644 (file)
--- a/tests/data/test1150
+++ b/tests/data/test1150
@@ -26,10 +26,10 @@ daniel
 <server>
 http
 </server>
- <name>
+<name>
 HTTP proxy with URLs using different ports
- </name>
- <command>
+</name>
+<command>
 --proxy http://%HOSTIP:%HTTPPORT http://test.remote.example.com.%TESTNUMBER:150/path http://test.remote.example.com.%TESTNUMBER:1234/path/
 </command>
 <features>

diff --git a/tests/data/test1151 b/tests/data/test1151
index bb24d1b13378532dd2b4585e5fecdd7fd48a375d..2da611ebfa26fbb0f916e6a615fbf3704180a19f 100644 (file)
--- a/tests/data/test1151
+++ b/tests/data/test1151
@@ -35,10 +35,10 @@ Set-Cookie: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with too long cookies
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c %LOGDIR/cookies%TESTNUMBER.txt
 </command>
 <features>

diff --git a/tests/data/test1152 b/tests/data/test1152
index 870215d9fffd6490cd0884a570fa3e15a240a5f2..490fde3b74e59ffc7c5d59df536626735dbb0ddc 100644 (file)
--- a/tests/data/test1152
+++ b/tests/data/test1152
@@ -36,10 +36,10 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP with uneven quote in PWD response
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/
 </command>
 </client>

diff --git a/tests/data/test1153 b/tests/data/test1153
index b481431328d29579421156b4408700f33feec1f8..36c76693ace14d44cf572cda0a97cb82362c9ce6 100644 (file)
--- a/tests/data/test1153
+++ b/tests/data/test1153
@@ -36,10 +36,10 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP with quoted double quotes
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/
 </command>
 </client>

diff --git a/tests/data/test1154 b/tests/data/test1154
index ab1addec6b62592caf74747d0d67ab1a83873b30..b7349e17d21006ae9530ca4547e6e35e883123d3 100644 (file)
--- a/tests/data/test1154
+++ b/tests/data/test1154
@@ -29,10 +29,10 @@ Long: %repeat[102400 x A]%
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with 100K (too long) response header
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1155 b/tests/data/test1155
index dbaf344e9f728485e4cce707129875eeda3bf439..579328d9253a421c9f7a0f1e9b13e7c978ee9ae3 100644 (file)
--- a/tests/data/test1155
+++ b/tests/data/test1155
@@ -24,10 +24,10 @@ Set-Cookie: domain=value;path=/
 <server>
 http
 </server>
- <name>
+<name>
 HTTP cookie with parameter word as name
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c %LOGDIR/cookies%TESTNUMBER.txt
 </command>
 <features>

diff --git a/tests/data/test1156 b/tests/data/test1156
index d638274b5f92dba528dae9a1143c7ec713ed71f3..94fa469dce62d851764357b0d3933f7f64f42142 100644 (file)
--- a/tests/data/test1156
+++ b/tests/data/test1156
@@ -54,10 +54,10 @@ http
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 HTTP resume/range fail range-error content-range combinations
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1157 b/tests/data/test1157
index 53f1b9963e628745467caa9ea9d72a18c03acc1b..4e246e7031b588d9363d94409cf0005b0accd816 100644 (file)
--- a/tests/data/test1157
+++ b/tests/data/test1157
@@ -32,12 +32,12 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 Get -H headers from empty file
- </name>
+</name>
 <file name="%LOGDIR/heads%TESTNUMBER.txt">
 </file>
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H @%LOGDIR/heads%TESTNUMBER.txt
 </command>
 </client>

diff --git a/tests/data/test1159 b/tests/data/test1159
index b09aff0e33530ba4b320258c3bb6baf88aa9369e..6ef2e4ad66e7e2d7527938b9ef951ab7f8169858 100644 (file)
--- a/tests/data/test1159
+++ b/tests/data/test1159
@@ -26,9 +26,9 @@ This server reply is for testing a simple Location: following
 <server>
 http
 </server>
- <name>
+<name>
 HTTP Location: and 'redirect_url' with non-supported scheme
- </name>
+</name>
 <command>
 http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w '%{redirect_url}\n'
 </command>

diff --git a/tests/data/test116 b/tests/data/test116
index f05c1bd2f5b4f04ba0711d397da7c70694136214..37aed2ceb2cd160538ee5fb2b42378724c2d4755 100644 (file)
--- a/tests/data/test116
+++ b/tests/data/test116
@@ -25,10 +25,10 @@ ftp
 <features>
 ipv6
 </features>
- <name>
+<name>
 FTP download, failed PORT
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P 1.2.3.4
 </command>
 </client>

diff --git a/tests/data/test1160 b/tests/data/test1160
index e6835987e7a61867a6e72228aa27dd0c45863019..0e946b34bf46e06f70ad17385b85dfdfe8236689 100644 (file)
--- a/tests/data/test1160
+++ b/tests/data/test1160
@@ -25,10 +25,10 @@ Set-Cookie: ____________
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with long funny format cookie
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c %LOGDIR/cookies%TESTNUMBER.txt
 </command>
 <features>

diff --git a/tests/data/test1161 b/tests/data/test1161
index 3b1a2fd191d92a9b1aad6f43fbdd2b9cc2d4f3de..dd8f9c9ebfc117b3293276c562915bafd9e9649a 100644 (file)
--- a/tests/data/test1161
+++ b/tests/data/test1161
@@ -24,10 +24,10 @@ Set-Cookie: ckyPersistent=permanent;path=;path=/
 <server>
 http
 </server>
- <name>
+<name>
 HTTP cookie with path set twice
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c %LOGDIR/cookies%TESTNUMBER.txt
 </command>
 <features>

diff --git a/tests/data/test1164 b/tests/data/test1164
index aedd6c97d470e0dbde6bc01e5a467bd3822eb062..d16b98bbf783a2dd44cc7e8c9fa45d03785d1075 100644 (file)
--- a/tests/data/test1164
+++ b/tests/data/test1164
@@ -29,9 +29,9 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
 <server>
 http
 </server>
- <name>
+<name>
 HTTP/0.9 GET and all zeroes
- </name>
+</name>
  <command option="force-output">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w '%{size_download}\n' --http0.9
 </command>

diff --git a/tests/data/test1165 b/tests/data/test1165
index 24c1c3eb1386306f34ca95507ff34d48b0fa6187..de4283af229cfe0cbeebb527454fac24279c8eee 100644 (file)
--- a/tests/data/test1165
+++ b/tests/data/test1165
@@ -13,9 +13,9 @@ CURL_DISABLE
 none
 </server>
 
- <name>
+<name>
 Verify configure.ac and source code CURL_DISABLE_-sync
- </name>
+</name>
 
 <command type="perl">
 %SRCDIR/disable-scan.pl %SRCDIR/..

diff --git a/tests/data/test1166 b/tests/data/test1166
index 609939f296e22c11a7554adabf78038bd449d421..92e8ff40469b378fb7f9f2b5748f43d7d671d839 100644 (file)
--- a/tests/data/test1166
+++ b/tests/data/test1166
@@ -26,10 +26,10 @@ This server reply is for testing a Location: following with cookies
 <server>
 http
 </server>
- <name>
+<name>
 HTTP response with cookies but not receiving!
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1167 b/tests/data/test1167
index 9eebe1c4e8fc950652b57d195e1dc996d321cf35..3c2fb1a5f14b74553b8bec35b579653f2577641f 100644 (file)
--- a/tests/data/test1167
+++ b/tests/data/test1167
@@ -12,9 +12,9 @@ source analysis
 none
 </server>
 
- <name>
+<name>
 Verify curl prefix of public symbols in header files
- </name>
+</name>
 
 <command type="perl">
 %SRCDIR/badsymbols.pl %SRCDIR/..

diff --git a/tests/data/test1168 b/tests/data/test1168
index 5d0ed3a67152bf2ec24da0282a6877ee0c9c1673..13dd566179cc3559f94a6a9421b167055f3b59fa 100644 (file)
--- a/tests/data/test1168
+++ b/tests/data/test1168
@@ -49,10 +49,10 @@ If this is received, the location following worked
 <server>
 http
 </server>
- <name>
+<name>
 HTTP redirect with credentials using # in user and password
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -u "catmai#d:#DZaRJYrixKE*gFY"
 </command>
 </client>

diff --git a/tests/data/test117 b/tests/data/test117
index b9c4b2ebadee4b9eeefe8f4423bc2b8df05b6a71..3bd5cb57f1ecd279d27f68f6ffd817e9a4352886 100644 (file)
--- a/tests/data/test117
+++ b/tests/data/test117
@@ -18,10 +18,10 @@ REPLY TYPE 314 bluah you f00l!
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP download, failed TYPE
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1170 b/tests/data/test1170
index fd718f32ceb0ddc88447bdae7fb0449efcde81ff..16dc6908df41e738cb513e18e8369817f133da48 100644 (file)
--- a/tests/data/test1170
+++ b/tests/data/test1170
@@ -43,10 +43,10 @@ libz
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET transfer-encoding with removed Connection:
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding -H "Connection:"
 </command>
 </client>

diff --git a/tests/data/test1171 b/tests/data/test1171
index e66f87cf959c951ab87ac5647c8f7716803aec55..d866c75a22c6ac7769d321499b4e1900f6cb9a52 100644 (file)
--- a/tests/data/test1171
+++ b/tests/data/test1171
@@ -43,10 +43,10 @@ libz
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET transfer-encoding with blanked Connection:
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding -H "Connection;"
 </command>
 </client>

diff --git a/tests/data/test1172 b/tests/data/test1172
index 53179623d41c3d6baa30174b2c431af71144f5c8..0de4713d39c8a80e9c630204b27efab721b36fb0 100644 (file)
--- a/tests/data/test1172
+++ b/tests/data/test1172
@@ -22,10 +22,10 @@ HTTP/0.9
 <server>
 http
 </server>
- <name>
+<name>
 HTTP/0.9 GET response denied
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --no-http0.9
 </command>
 </client>

diff --git a/tests/data/test1173 b/tests/data/test1173
index f52afa6bbc5d951b5f9a028509532c32fb06cf67..b5dafbb3b847a545b275fbb629dd513aca7a3e32 100644 (file)
--- a/tests/data/test1173
+++ b/tests/data/test1173
@@ -14,9 +14,9 @@ documentation
 none
 </server>
 
- <name>
+<name>
 Man page syntax checks
- </name>
+</name>
 
 <command type="perl">
 %SRCDIR/manpage-syntax.pl %SRCDIR/../docs/libcurl/symbols-in-versions %SRCDIR/../docs/*.1  %SRCDIR/../docs/libcurl/*.3 %SRCDIR/../docs/libcurl/opts/*.3

diff --git a/tests/data/test1174 b/tests/data/test1174
index 5f45bb8622691f395b97ad1e27483b7d3bd21b4f..48938a7be3f5572a60c1b8e0d50135fc3dc25c4a 100644 (file)
--- a/tests/data/test1174
+++ b/tests/data/test1174
@@ -22,10 +22,10 @@ HTTP/0.9
 <server>
 http
 </server>
- <name>
+<name>
 HTTP/0.9 GET response denied by default
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1175 b/tests/data/test1175
index 61f0689154a0a26b773aefaa1aa2d39752e49943..5190dbe2acbe5c0f777425d5e8f1c8a19d2b064f 100644 (file)
--- a/tests/data/test1175
+++ b/tests/data/test1175
@@ -13,9 +13,9 @@ symbols-in-versions
 none
 </server>
 
- <name>
+<name>
 Verify that symbols-in-versions and libcurl-errors.3 are in sync
- </name>
+</name>
 
 <command type="perl">
 %SRCDIR/error-codes.pl %SRCDIR

diff --git a/tests/data/test1176 b/tests/data/test1176
index 9ad1150f19db893dd860e8a516bd8ff74a06d204..86d23a2ccc2803736711c0632ebfcaf071388ece 100644 (file)
--- a/tests/data/test1176
+++ b/tests/data/test1176
@@ -30,9 +30,9 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 --output using #0
- </name>
+</name>
  <command option="no-output">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o '%LOGDIR/base-#0'
 </command>

diff --git a/tests/data/test1177 b/tests/data/test1177
index 29ddf3f877293a4f8fa7c958d2c86fc05dd8002d..66fe49767bb05bbaeacd37d51e39eb730582da8a 100644 (file)
--- a/tests/data/test1177
+++ b/tests/data/test1177
@@ -13,9 +13,9 @@ CURL_VERSION
 none
 </server>
 
- <name>
+<name>
 Verify that feature names and CURL_VERSION_* in lib and docs are in sync
- </name>
+</name>
 
 <command type="perl">
 %SRCDIR/version-scan.pl %SRCDIR/../docs/libcurl/curl_version_info.3 %SRCDIR/../include/curl/curl.h %SRCDIR/../lib/version.c

diff --git a/tests/data/test1178 b/tests/data/test1178
index f8fa1ca1cb1791af325f243081e99771983b8a93..db6a745e6f75f2bb243b5ed37a0ebdcddf0b7a7a 100644 (file)
--- a/tests/data/test1178
+++ b/tests/data/test1178
@@ -25,11 +25,11 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 HTTP proxy auth with credentials longer than 256 bytes
- </name>
+</name>
 # 400 x 'A' : 600 x 'B' ...
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER -x http://%HOSTIP:%HTTPPORT -U AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA:BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
 </command>
 <features>

diff --git a/tests/data/test118 b/tests/data/test118
index 4d47282af9685348b3d354af9ad08d4996f257bd..9b5b8708eb6b8c76c0044301a42126364917f521 100644 (file)
--- a/tests/data/test118
+++ b/tests/data/test118
@@ -21,10 +21,10 @@ REPLY SIZE 500 command not understood
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP download, failed RETR
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1180 b/tests/data/test1180
index 1eb9ed69b603acf8f74aa3a28c6dc0ad92950290..d04542ef965c8d71777ee3654efc831959e9b06a 100644 (file)
--- a/tests/data/test1180
+++ b/tests/data/test1180
@@ -27,10 +27,10 @@ http
 <features>
 proxy
 </features>
- <name>
+<name>
 HTTP GET request with proxy and -H "Proxy-Connection: keep-alive"
- </name>
- <command>
+</name>
+<command>
 --proxy http://%HOSTIP:%HTTPPORT -H "Proxy-Connection: Keep-Alive" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1181 b/tests/data/test1181
index 367265c802b86da5a1ef7f2e5986a3a46627dc1f..8f744669ee7bb2386cc68ff28939b53108135555 100644 (file)
--- a/tests/data/test1181
+++ b/tests/data/test1181
@@ -27,10 +27,10 @@ http
 <features>
 proxy
 </features>
- <name>
+<name>
 HTTP GET request with proxy and --proxy-header "Proxy-Connection: Keep-Alive"
- </name>
- <command>
+</name>
+<command>
 --proxy http://%HOSTIP:%HTTPPORT --proxy-header "Proxy-Connection: Keep-Alive" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1183 b/tests/data/test1183
index 2955bdcc49a61857327d1466871e271491e5ab43..5f795ed66601258ebe55dea15f4b9a532471b6fb 100644 (file)
--- a/tests/data/test1183
+++ b/tests/data/test1183
@@ -27,10 +27,10 @@ http
 <features>
 proxy
 </features>
- <name>
+<name>
 %TESTNUMBER used instead of actual test number
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1184 b/tests/data/test1184
index feac348ef5d440c72d55e5a0e06a72a04d7fe852..268da350fbe8c9fa27562605a6cc07067a368332 100644 (file)
--- a/tests/data/test1184
+++ b/tests/data/test1184
@@ -45,10 +45,10 @@ second
 http
 http-proxy
 </server>
- <name>
+<name>
 HTTP 1.1 CONNECT with redirect and set -H user-agent
- </name>
- <command>
+</name>
+<command>
 -x %HOSTIP:%PROXYPORT -p http://%HOSTIP.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER -L -H "User-Agent: %TESTNUMBER-agent"
 </command>
 <features>

diff --git a/tests/data/test1187 b/tests/data/test1187
index cc09564a5d4617b5c036cba6b9e8442d3e7ab42c..aaa8d107b381c0a2d656fed974050fc97cf0978a 100644 (file)
--- a/tests/data/test1187
+++ b/tests/data/test1187
@@ -20,16 +20,16 @@ Mime
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP multipart with file name escaping
- </name>
+</name>
 <stdin>
 From: different\r
 To: another\r
 \r
 body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -F  "=This is the mail text" -F '=File content;filename="strange\file\"name"'
 </command>
 </client>

diff --git a/tests/data/test1188 b/tests/data/test1188
index 0cbaaeb04fc6559f8b37281c479a2c29c970a01c..702856245d976ca378aea4ef32404f2817f1cd77 100644 (file)
--- a/tests/data/test1188
+++ b/tests/data/test1188
@@ -22,9 +22,9 @@ Connection: close
 <server>
 http
 </server>
- <name>
+<name>
 --write-out with %{onerror} and %{urlnum} to stderr
- </name>
+</name>
 <command>
 -f -s -w '%{onerror}%{stderr}%{urlnum} says %{exitcode} %{errormsg}\n' http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER
 </command>

diff --git a/tests/data/test1189 b/tests/data/test1189
index 27e35c41ee016d4d68933060f9a1ca91b792dec6..0c19e70f77d666550e3814ea50b95376de8ff40b 100644 (file)
--- a/tests/data/test1189
+++ b/tests/data/test1189
@@ -25,10 +25,10 @@ Mime
 <server>
 http
 </server>
- <name>
+<name>
 Multipart formposting with backslash-escaping of name= and filename=
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --form-escape -F name=daniel -F tool=curl --form-string "str1=@literal" --form-string "str2=<verbatim;type=xxx/yyy" -F "file=@%LOGDIR/test%TESTNUMBER.txt;type=moo/foobar;filename=fakerfile" -F file2=@%LOGDIR/test%TESTNUMBER.txt -F "file3=@\"%LOGDIR/test%TESTNUMBER.txt\";type=mo/foo;filename=\"f\\\\\\\\ak\\\\\\er,\\\\an\\d;.t\\\"xt\"" -F 'file4=@"%LOGDIR/test%TESTNUMBER.txt"; filename="A\\AA\"\"\\\"ZZZ"'
 </command>
 # We create this file before the command is invoked!

diff --git a/tests/data/test119 b/tests/data/test119
index 6999e0da709a2f14126265cac4efab79350041cf..4426def0bde43c339454015f1162bf7c95fa7e52 100644 (file)
--- a/tests/data/test119
+++ b/tests/data/test119
@@ -20,10 +20,10 @@ REPLY SIZE 500 command not understood
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP download, failed RETR with PORT
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P -
 </command>
 </client>

diff --git a/tests/data/test1197 b/tests/data/test1197
index 8b882c714c999921cb96a23f42df9c664a946db1..22bf8dbbe8d6b8f34c282d698bbb38309a1ebddb 100644 (file)
--- a/tests/data/test1197
+++ b/tests/data/test1197
@@ -39,10 +39,10 @@ bigger monster
 <server>
 http
 </server>
- <name>
+<name>
 HTTP POST redirected to GET and --write-out method
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{method}\n" -L -d "twinkle twinkle little star"
 </command>
 </client>

diff --git a/tests/data/test12 b/tests/data/test12
index a7c30d220bcc61357edf65760253d9a5b2f78a09..48380a1e9b93f77f69f159c1af3b53e7a97ed7d1 100644 (file)
--- a/tests/data/test12
+++ b/tests/data/test12
@@ -32,10 +32,10 @@ in the request
 <server>
 http
 </server>
- <name>
+<name>
 HTTP range support
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -r 100-200
 </command>
 </client>

diff --git a/tests/data/test120 b/tests/data/test120
index 45e11a63e5fd9260db0db9cd234536f19ab689bf..64628b6599fc2748d9b6323dd16711a20a9ccd7c 100644 (file)
--- a/tests/data/test120
+++ b/tests/data/test120
@@ -27,10 +27,10 @@ REPLY EPSV 314 bluah you f00l!
 <server>
 ftp
 </server>
- <name>
+<name>
 ftp download with post-quote delete operation
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "-DELE file"
 </command>
 </client>

diff --git a/tests/data/test1200 b/tests/data/test1200
index 886fa166f241143e093d18526427688c55478276..342077b8a5d86f209ab021632ce5c501b56abb7d 100644 (file)
--- a/tests/data/test1200
+++ b/tests/data/test1200
@@ -21,10 +21,10 @@ iMenu results               error.host      1
 <server>
 gopher
 </server>
- <name>
+<name>
 Gopher index
- </name>
- <command>
+</name>
+<command>
 gopher://%HOSTIP:%GOPHERPORT/1/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1201 b/tests/data/test1201
index 9f1ba664b281ca0171a13ee52f533fba915a2256..296e7fa6a04e185f75fe94a8ed21b18c41254103 100644 (file)
--- a/tests/data/test1201
+++ b/tests/data/test1201
@@ -21,10 +21,10 @@ iMenu results               error.host      1
 <server>
 gopher
 </server>
- <name>
+<name>
 Gopher selector
- </name>
- <command>
+</name>
+<command>
 gopher://%HOSTIP:%GOPHERPORT/1/selector/SELECTOR/%TESTNUMBER?
 </command>
 </client>

diff --git a/tests/data/test1202 b/tests/data/test1202
index aefb6d00825f96ba59401324ab6102b426cca5ab..ab1d51c0f81b20882ff3aa3471d68742b92c5800 100644 (file)
--- a/tests/data/test1202
+++ b/tests/data/test1202
@@ -22,10 +22,10 @@ iSearch results             error.host      1
 <server>
 gopher
 </server>
- <name>
+<name>
 Gopher query
- </name>
- <command>
+</name>
+<command>
 "gopher://%HOSTIP:%GOPHERPORT/7/the/search/engine%09query%20succeeded/%TESTNUMBER"
 </command>
 </client>

diff --git a/tests/data/test1203 b/tests/data/test1203
index 9f4648e272e1098e707670cd4b2fe6cc137c9165..b4c70e9cbc0b8008f91bc2ef0a93e0bcef9afd99 100644 (file)
--- a/tests/data/test1203
+++ b/tests/data/test1203
@@ -25,10 +25,10 @@ ipv6
 <server>
 gopher-ipv6
 </server>
- <name>
+<name>
 Gopher IPv6 index
- </name>
- <command>
+</name>
+<command>
 -g gopher://%HOST6IP:%GOPHER6PORT/1/moo/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1204 b/tests/data/test1204
index 9e8c2b6a03c41564a310c95c03d2ab470073b26d..0aac591b7140a4fe2abad4388f2dc69b59aa1a83 100644 (file)
--- a/tests/data/test1204
+++ b/tests/data/test1204
@@ -51,10 +51,10 @@ This IS the real page!
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with WWW-Authenticate and multiple auths in a single line
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth
 </command>
 </client>

diff --git a/tests/data/test1205 b/tests/data/test1205
index df77175d642213530089f529133984c4270d84df..5a7fb7dc51fae3c94976c6d2e30d50d9202a2203 100644 (file)
--- a/tests/data/test1205
+++ b/tests/data/test1205
@@ -26,10 +26,10 @@ Funny-head: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with 18K HTTP header
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1206 b/tests/data/test1206
index 453b991084434e24f2ad343f40ddcb9ceb0242c7..228df4adb773712dfae97b8a33b209efccf3d8c4 100644 (file)
--- a/tests/data/test1206
+++ b/tests/data/test1206
@@ -22,10 +22,10 @@ NODATACONN425
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP PORT and 425 on download
- </name>
- <command>
+</name>
+<command>
 --max-time %FTPTIME2 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P -
 </command>
 

diff --git a/tests/data/test1207 b/tests/data/test1207
index f105df54c0f4cac101d9b9c09da08ae505f37c81..612c42b0d6dc3b0a075939870667d5e00ff7fae5 100644 (file)
--- a/tests/data/test1207
+++ b/tests/data/test1207
@@ -22,10 +22,10 @@ NODATACONN421
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP PORT and 421 on download
- </name>
- <command>
+</name>
+<command>
 --max-time %FTPTIME2 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P -
 </command>
 

diff --git a/tests/data/test1208 b/tests/data/test1208
index 57937a967222183d9543f29525e5b4e07d914cb9..055a0a58c63b1eb5e4ee9886458fb3e154cd79f2 100644 (file)
--- a/tests/data/test1208
+++ b/tests/data/test1208
@@ -26,10 +26,10 @@ NODATACONN150
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP PORT download, no data conn and no transient negative reply
- </name>
- <command>
+</name>
+<command>
 --max-time %FTPTIME2 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P -
 </command>
 

diff --git a/tests/data/test1209 b/tests/data/test1209
index 8a4f1f85d7d97e0c4f46438d45cd16b9ddc8d684..38e1003c9042450ada7de7a5dd24421aa286f7a8 100644 (file)
--- a/tests/data/test1209
+++ b/tests/data/test1209
@@ -24,10 +24,10 @@ NODATACONN
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP PORT download, no data conn and no positive preliminary reply
- </name>
- <command>
+</name>
+<command>
 --max-time %FTPTIME2 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P -
 </command>
 

diff --git a/tests/data/test121 b/tests/data/test121
index b8ec70136c5c5614f47f312872012ee2f1410b20..3625d0e3e041d98ee1a85d7c4543afdfc78cdea0 100644 (file)
--- a/tests/data/test121
+++ b/tests/data/test121
@@ -25,10 +25,10 @@ works
 <server>
 ftp
 </server>
- <name>
+<name>
 ftp download with post- and pre-transfer delete operations
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "-DELE after_transfer" -Q "DELE before_transfer"
 </command>
 </client>

diff --git a/tests/data/test1211 b/tests/data/test1211
index 072aede023ecce2b2cb900c17000591182ae9c30..6ca7eaea917f1bd7b6ff78384963b0e234f47d80 100644 (file)
--- a/tests/data/test1211
+++ b/tests/data/test1211
@@ -24,10 +24,10 @@ NODATACONN425
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP PORT and 425 on download
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P -
 </command>
 

diff --git a/tests/data/test1212 b/tests/data/test1212
index d445f937639f2cb7b11fb5c23a5bbf3c0797f497..56b189c9de4ac82a0cbb02ccf9022ce878f7f2c2 100644 (file)
--- a/tests/data/test1212
+++ b/tests/data/test1212
@@ -29,9 +29,9 @@ proxy
 <server>
 http
 </server>
- <name>
+<name>
 noproxy setting together with socks proxy
- </name>
+</name>
 
 <command>
 http://user:secret@%HOSTIP:%HTTPPORT/ulion/%TESTNUMBER --socks5 non-existing-host.haxx.se:1080 --noproxy %HOSTIP --max-time 5

diff --git a/tests/data/test1213 b/tests/data/test1213
index 6bd4d2c362f493d75c6b04604284f01c68a3bef4..195329ecb200a5cfbd75d45b20d19be6a4135d3a 100644 (file)
--- a/tests/data/test1213
+++ b/tests/data/test1213
@@ -26,13 +26,13 @@ the content goes here
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with proxy and host-only URL
- </name>
+</name>
 # the thing here is that this sloppy form is accepted and we convert it
 # for normal server use, and we need to make sure it gets converted to
 # RFC style even for proxies
- <command>
+<command>
 -x %HOSTIP:%HTTPPORT we.want.that.site.com.%TESTNUMBER
 </command>
 <features>

diff --git a/tests/data/test1214 b/tests/data/test1214
index 1758693971ec9644faf292f0c6d111eef5740854..fc8a94eaf70f9bb8f01a648f3e971a04adcd90df 100644 (file)
--- a/tests/data/test1214
+++ b/tests/data/test1214
@@ -26,13 +26,13 @@ the content goes here
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with proxy and URL with ? and no slash separator
- </name>
+</name>
 # the thing here is that this sloppy form is accepted and we convert it
 # for normal server use, and we need to make sure it gets converted to
 # RFC style even for proxies
- <command>
+<command>
 -x %HOSTIP:%HTTPPORT http://we.want.that.site.com.%TESTNUMBER?moo=foo
 </command>
 <features>

diff --git a/tests/data/test1216 b/tests/data/test1216
index 768c39e66d6079b1df70ce3ce9fb2c48c84aa968..6341ba473c33854c0340fadd9d6931e637d2db3f 100644 (file)
--- a/tests/data/test1216
+++ b/tests/data/test1216
@@ -27,10 +27,10 @@ This server says moo
 <server>
 http
 </server>
- <name>
+<name>
 HTTP cookie domains tailmatching the host name
- </name>
- <command>
+</name>
+<command>
 http://example.fake/c/%TESTNUMBER http://bexample.fake/c/%TESTNUMBER -b %LOGDIR/injar%TESTNUMBER -x %HOSTIP:%HTTPPORT
 </command>
 <file name="%LOGDIR/injar%TESTNUMBER">

diff --git a/tests/data/test1217 b/tests/data/test1217
index 0f4772d9706f478a399d7f0c4975145b162fa977..691c88e73203a63a6a4b4942a9de881cd71cd5d1 100644 (file)
--- a/tests/data/test1217
+++ b/tests/data/test1217
@@ -22,10 +22,10 @@ REPLY PWD 257 there is rubbish all over "/this/is/the/path"
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP with rubbish before name in 257-response
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/get/file/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/get/file/again/%TESTNUMBER --ftp-method singlecwd
 </command>
 </client>

diff --git a/tests/data/test1218 b/tests/data/test1218
index e176c47fa3e116bb6e07046caf2623dbdf6d7237..afbc2b5646743fc49763cb7a2cc3672868ac92fd 100644 (file)
--- a/tests/data/test1218
+++ b/tests/data/test1218
@@ -26,10 +26,10 @@ This server says moo
 <server>
 http
 </server>
- <name>
+<name>
 HTTP cookies and domains with same prefix
- </name>
- <command>
+</name>
+<command>
 http://example.fake/c/%TESTNUMBER http://example.fake/c/%TESTNUMBER http://bexample.fake/c/%TESTNUMBER -b nonexisting -x %HOSTIP:%HTTPPORT
 </command>
 <features>

diff --git a/tests/data/test1219 b/tests/data/test1219
index f579859fda71499a5b3aae9a63fe4ab4184e93b1..454654399b924bf33f046485ecd723e639e2f547 100644 (file)
--- a/tests/data/test1219
+++ b/tests/data/test1219
@@ -26,10 +26,10 @@ REPLY welcome 230 welcome without password
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP with no user+password required (230 response)
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 

diff --git a/tests/data/test122 b/tests/data/test122
index 8d636af4786afb5fd51a4e437214d63c91d48131..1f007c1ce036d0814e0611efdb4998326cc09cd5 100644 (file)
--- a/tests/data/test122
+++ b/tests/data/test122
@@ -21,10 +21,10 @@ REPLY EPSV 500 no such command
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP download resume with whole file already downloaded
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C 5
 </command>
 </client>

diff --git a/tests/data/test1220 b/tests/data/test1220
index d7e2ff94245a2dc286d4e1c9a8931cb58a09fe20..38e5b8876cdab9aa661e0c44604d3490217341b4 100644 (file)
--- a/tests/data/test1220
+++ b/tests/data/test1220
@@ -17,9 +17,9 @@ URL
 <server>
 file
 </server>
- <name>
+<name>
 file:// URLs with query string
- </name>
+</name>
 <command option="no-include">
 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt?a_query=foobar#afragment
 </command>

diff --git a/tests/data/test1221 b/tests/data/test1221
index 42617e85b0afd770f38f8e32ca22f658299acfef..c2fd7a5dddc5c9b8efaf62019cae0bc04dd6e514 100644 (file)
--- a/tests/data/test1221
+++ b/tests/data/test1221
@@ -25,10 +25,10 @@ Content-Length: 0
 <server>
 http
 </server>
- <name>
+<name>
 --url-query with --data-urlencode
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --url-query "my name is moo[]" --url-query "yes=s i r" --url-query "v_alue@%LOGDIR/%TESTNUMBER.txt" --url-query @%LOGDIR/%TESTNUMBER.txt --url-query "+%3d%3d" --data-urlencode "start=once upon the time"
 </command>
 <file name="%LOGDIR/%TESTNUMBER.txt">

diff --git a/tests/data/test1222 b/tests/data/test1222
index e65b514ea287346eda519a0e6e5b8afda240b93a..b56cf6879a7ba96165a3c9a1a375833fb7e93a5c 100644 (file)
--- a/tests/data/test1222
+++ b/tests/data/test1222
@@ -12,9 +12,9 @@ source analysis
 none
 </server>
 
- <name>
+<name>
 Verify deprecation statuses and versions
- </name>
+</name>
 
 <command type="perl">
 %SRCDIR/check-deprecated.pl %SRCDIR/..

diff --git a/tests/data/test1223 b/tests/data/test1223
index 9404adf6f271ab5f8c40c060c53d4077c7a1d662..6c1ee00189e7848b361df7e98249ed63b5222dd9 100644 (file)
--- a/tests/data/test1223
+++ b/tests/data/test1223
@@ -26,10 +26,10 @@ hej
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET -w remote_ip and -w remote_port
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w 'IP %{remote_ip} and PORT %{remote_port}\n'
 </command>
 </client>

diff --git a/tests/data/test1224 b/tests/data/test1224
index fc898a7a197262e9b9c24981b4dcc6ff1b477c58..64ba4482c58624d51c7244a3fc81ca9eee09b5ed 100644 (file)
--- a/tests/data/test1224
+++ b/tests/data/test1224
@@ -23,10 +23,10 @@ works
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP fetch a file from the root directory
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT//%TESTNUMBER
 </command>
 

diff --git a/tests/data/test1225 b/tests/data/test1225
index 7e4f39b01006714c156b5d839d95f1ad71eeb326..b20363c3e45c1124f50f31f23499cd39e2612787 100644 (file)
--- a/tests/data/test1225
+++ b/tests/data/test1225
@@ -23,10 +23,10 @@ works
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP fetch two files using absolute paths
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT//foo/%TESTNUMBER ftp://%HOSTIP:%FTPPORT//foo/bar/%TESTNUMBER
 </command>
 

diff --git a/tests/data/test1226 b/tests/data/test1226
index a22776eac711a96462667a810cec4cfc90aa6a82..08e706b9b0166461653a44a8d0c29b50139eeea3 100644 (file)
--- a/tests/data/test1226
+++ b/tests/data/test1226
@@ -23,10 +23,10 @@ works
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP fetch a file from the root directory with singlecwd
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT//%TESTNUMBER --ftp-method singlecwd
 </command>
 

diff --git a/tests/data/test1227 b/tests/data/test1227
index 1cd9bf24fa5a025ee9f5c3d17203d7f4465415fe..30477a46a0b89c6b3eac657c92a0573c7cda3a44 100644 (file)
--- a/tests/data/test1227
+++ b/tests/data/test1227
@@ -23,10 +23,10 @@ works
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP fetch a file from the root directory with nocwd
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT//%TESTNUMBER --ftp-method nocwd
 </command>
 

diff --git a/tests/data/test1228 b/tests/data/test1228
index d33b742892ac66f172c395958f1bfd4fb9874211..a4df51c46ccf5b499eeea4dcfd1425a6f248826f 100644 (file)
--- a/tests/data/test1228
+++ b/tests/data/test1228
@@ -25,10 +25,10 @@ This server says cookie path test
 <server>
 http
 </server>
- <name>
+<name>
 HTTP cookie path match
- </name>
- <command>
+</name>
+<command>
 http://example.fake/hoge/%TESTNUMBER http://example.fake/hogege/ -b nonexisting -x %HOSTIP:%HTTPPORT
 </command>
 <features>

diff --git a/tests/data/test1229 b/tests/data/test1229
index 06d81758e94f036da99617a963f4c864165fc8b9..96cdbfe1332ffbcc043f13c3f054ee5aa8963b65 100644 (file)
--- a/tests/data/test1229
+++ b/tests/data/test1229
@@ -55,10 +55,10 @@ http
 !SSPI
 crypto
 </features>
- <name>
+<name>
 HTTP with Digest authorization with user name needing escape
- </name>
- <command>
+</name>
+<command>
 http://%5cuser%22:password@%HOSTIP:%HTTPPORT/%TESTNUMBER --digest
 </command>
 </client>

diff --git a/tests/data/test123 b/tests/data/test123
index 21d3b58ae1444a5c7dac57f2de569d6cb2581839..8ccd69cf6816490da107e6d273758fb45bcc8ea6 100644 (file)
--- a/tests/data/test123
+++ b/tests/data/test123
@@ -15,10 +15,10 @@ Resume
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP upload resume with whole file already downloaded
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -C 51
 </command>
 <file name="%LOGDIR/upload%TESTNUMBER">

diff --git a/tests/data/test1230 b/tests/data/test1230
index ef841d0951b334c5e0594e7aee86e1da8e7ea021..5cdf1643fe42089d2ad24f6f0a29584eae2125a3 100644 (file)
--- a/tests/data/test1230
+++ b/tests/data/test1230
@@ -50,11 +50,11 @@ http-proxy
 http-ipv6
 http
 </server>
- <name>
+<name>
 HTTP CONNECT to IPv6 numerical address
- </name>
+</name>
 # 0x4ce == %TESTNUMBER, the test number
- <command>
+<command>
 http://[1234:1234:1234::4ce]:%HTTPPORT/wanted/page/%TESTNUMBER -p -x %HOSTIP:%HTTPPORT
 </command>
 </client>

diff --git a/tests/data/test1231 b/tests/data/test1231
index c37f50915dbb21a30f4455cd3fa32d03b4f76c05..2c7c8bb0009d3b1de007c9d5deecffd95087b204 100644 (file)
--- a/tests/data/test1231
+++ b/tests/data/test1231
@@ -33,10 +33,10 @@ Connection: close
 <server>
 http
 </server>
- <name>
+<name>
 HTTP URL with dotdot removal from path
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/../../hej/but/who/../%TESTNUMBER?stupid=me/../%TESTNUMBER#soo/../%TESTNUMBER http://%HOSTIP:%HTTPPORT/../../hej/but/who/../%TESTNUMBER0001#/../%TESTNUMBER0001
 </command>
 </client>

diff --git a/tests/data/test1232 b/tests/data/test1232
index b62a07d1662712a5ebcb65d2fef7f0edbbd1ee7c..28d2eee735d76ae232fa309d2e587198d69a450c 100644 (file)
--- a/tests/data/test1232
+++ b/tests/data/test1232
@@ -35,10 +35,10 @@ Connection: close
 <server>
 http
 </server>
- <name>
+<name>
 HTTP URL with dotdot removal from path using an HTTP proxy
- </name>
- <command>
+</name>
+<command>
 --proxy http://%HOSTIP:%HTTPPORT http://test.remote.haxx.se.%TESTNUMBER:8990/../../hej/but/who/../%TESTNUMBER?stupid=me/../%TESTNUMBER#soo/../%TESTNUMBER http://test.remote.haxx.se.%TESTNUMBER:8990/../../hej/but/who/../%TESTNUMBER0001#/../%TESTNUMBER0001
 </command>
 <features>

diff --git a/tests/data/test1233 b/tests/data/test1233
index b5dedca09ad092941a862b3b127954cd7d964d86..79e641d3686ac21d4567fd3038173d0038c25826 100644 (file)
--- a/tests/data/test1233
+++ b/tests/data/test1233
@@ -22,10 +22,10 @@ here are some bytes
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP failing to connect to EPSV port, switching to PASV
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1234 b/tests/data/test1234
index c20b3b4a3b2a7b5898dd5b46f12df29fe0b4c0f7..5676a809cd0a938891bf0366ef42ad61e218e5b3 100644 (file)
--- a/tests/data/test1234
+++ b/tests/data/test1234
@@ -15,10 +15,10 @@ FAILURE
 <server>
 none
 </server>
- <name>
+<name>
 abusing {}-globbing
- </name>
- <command>
+</name>
+<command>
 "%HOSTIP:%NOLISTENPORT/%TESTNUMBER[0-1]{" "%HOSTIP:%NOLISTENPORT/{}{}{}{"
 </command>
 </client>

diff --git a/tests/data/test1235 b/tests/data/test1235
index 24e7f7391956496a362416a354eb1c2a4173eec3..56664f3f0e82f228082cc3521af78bcf69708215 100644 (file)
--- a/tests/data/test1235
+++ b/tests/data/test1235
@@ -30,10 +30,10 @@ two is nice too
 <server>
 http
 </server>
- <name>
+<name>
 multiple requests using {}{} in the URL
- </name>
- <command>
+</name>
+<command>
 "%HOSTIP:%HTTPPORT/{%TESTNUMBER,%TESTNUMBER}{0001,0002}"
 </command>
 </client>

diff --git a/tests/data/test1236 b/tests/data/test1236
index 7408a7bae0c1d2fb0e77b1a5b20e8bb7352c45f2..286bb0a02f426553562270116f20c979b4289e61 100644 (file)
--- a/tests/data/test1236
+++ b/tests/data/test1236
@@ -14,11 +14,11 @@ FAILURE
 <server>
 none
 </server>
- <name>
+<name>
 [] globbing overflowing the range counter
- </name>
+</name>
 # 2^62 == 4611686018427387904
- <command>
+<command>
 "%HOSTIP:%NOLISTENPORT/1234[0-1]{" "%HOSTIP:%NOLISTENPORT/[1-4611686018427387904][1-4611686018427387904]"
 </command>
 </client>

diff --git a/tests/data/test1237 b/tests/data/test1237
index 8e9590e24e5fae0172133530026c06c3ae5a512a..7e49f830d10e43de6755da86c8bb7fbbad6967c2 100644 (file)
--- a/tests/data/test1237
+++ b/tests/data/test1237
@@ -23,10 +23,10 @@ Content-Type: text/html
 <server>
 http
 </server>
- <name>
+<name>
 URL with 1000+ letter user name + password
- </name>
- <command>
+</name>
+<command>
 "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA:BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB@%HOSTIP:%HTTPPORT/%TESTNUMBER"
 </command>
 </client>

diff --git a/tests/data/test1238 b/tests/data/test1238
index 3e36fbfcca795196cd332a3e5e17ea54c2133518..49b9e65e5711c4120b036f95863676bd9d025f9e 100644 (file)
--- a/tests/data/test1238
+++ b/tests/data/test1238
@@ -35,11 +35,11 @@ tftp
 <killserver>
 tftp
 </killserver>
- <name>
+<name>
 slow TFTP retrieve cancel due to -Y and -y
- </name>
+</name>
 # if less than 1000 bytes/sec within 2 seconds, abort!
- <command>
+<command>
 tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER -Y1000 -y2
 </command>
 </client>

diff --git a/tests/data/test1239 b/tests/data/test1239
index 1679ce5b32ac28f42dccf7686b6f7670eadd4916..601f45459de0f1ced45ef5f1effcf1677ae86858 100644 (file)
--- a/tests/data/test1239
+++ b/tests/data/test1239
@@ -30,10 +30,10 @@ Content-Type: text/html
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with -z + -w response_code and simulated 304
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "-dec 12 12:00:00 1999 GMT" -w '%{response_code}'
 </command>
 </client>

diff --git a/tests/data/test124 b/tests/data/test124
index f21c28f05baebb5d041cef978c66d008800b28cd..d2717949c9303c070b172429024ff37db77fe050 100644 (file)
--- a/tests/data/test124
+++ b/tests/data/test124
@@ -22,10 +22,10 @@ REPLY EPSV 314 bluah you f00l!
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP download, failed PWD
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1240 b/tests/data/test1240
index 11a7e0f8944cfcf14d494cc57c96bfe19845dfdf..5e99f8aff095badb5f93f327139172754d0c8b76 100644 (file)
--- a/tests/data/test1240
+++ b/tests/data/test1240
@@ -21,10 +21,10 @@ Connection: close
 <server>
 http
 </server>
- <name>
+<name>
 glob [0-1] with stuff after range (7.33.0 regression)
- </name>
- <command>
+</name>
+<command>
 "%HOSTIP:%HTTPPORT/0[0-1]/%TESTNUMBER"
 </command>
 </client>

diff --git a/tests/data/test1241 b/tests/data/test1241
index 952fa2355f02399ee46ac08d53516cc17d7084ac..e114ad326a5ffc550d79e273233ecdd63413713f 100644 (file)
--- a/tests/data/test1241
+++ b/tests/data/test1241
@@ -34,10 +34,10 @@ Connection: close
 <server>
 http
 </server>
- <name>
+<name>
 HTTP _without_ dotdot removal
- </name>
- <command>
+</name>
+<command>
 --path-as-is --proxy http://%HOSTIP:%HTTPPORT http://test.remote.haxx.se.%TESTNUMBER:8990/../../hej/but/who/../%TESTNUMBER?stupid=me/../%TESTNUMBER#soo/../%TESTNUMBER http://test.remote.haxx.se.%TESTNUMBER:8990/../../hej/but/who/../%TESTNUMBER0001#/../%TESTNUMBER0001
 </command>
 <features>

diff --git a/tests/data/test1242 b/tests/data/test1242
index 61938a041756a31c38e3c389911a297fe355d07c..03d527c32827364541a603fcd4b3dff0ed56c58c 100644 (file)
--- a/tests/data/test1242
+++ b/tests/data/test1242
@@ -23,10 +23,10 @@ returned
 <server>
 tftp
 </server>
- <name>
+<name>
 TFTP retrieve without TFTP options requests
- </name>
- <command>
+</name>
+<command>
 tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER --tftp-no-options
 </command>
 </client>

diff --git a/tests/data/test1243 b/tests/data/test1243
index 7f71631917d99596ecac755473dbc8101437a3d1..4a8daf584176d4ed6dddfc0f6bf0a9d07ee84980 100644 (file)
--- a/tests/data/test1243
+++ b/tests/data/test1243
@@ -12,10 +12,10 @@ TFTP WRQ
 <server>
 tftp
 </server>
- <name>
+<name>
 TFTP send without TFTP options requests
- </name>
- <command>
+</name>
+<command>
 -T %LOGDIR/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT// --tftp-no-options
 </command>
 <file name="%LOGDIR/test%TESTNUMBER.txt">

diff --git a/tests/data/test1246 b/tests/data/test1246
index 4cb0c3a16e2454a352aa28ff8a3d9a97001e9bbe..7723192fa14e1b35b15455aef76b72350c86b2e9 100644 (file)
--- a/tests/data/test1246
+++ b/tests/data/test1246
@@ -34,10 +34,10 @@ Connection: close
 <server>
 http
 </server>
- <name>
+<name>
 URL with '#' at end of host name instead of '/'
- </name>
- <command>
+</name>
+<command>
 --proxy http://%HOSTIP:%HTTPPORT http://test.remote.haxx.se.%TESTNUMBER:%HTTPPORT#@127.0.0.1/tricked.html no-scheme-url.com.%TESTNUMBER:%HTTPPORT#@127.127.127.127/again.html
 </command>
 <features>

diff --git a/tests/data/test1247 b/tests/data/test1247
index 02c695cd6d3c19986e9f49f1adaa7add91134ac2..917deac3ee5bc35690ae7170e8e6a28556878ee4 100644 (file)
--- a/tests/data/test1247
+++ b/tests/data/test1247
@@ -19,10 +19,10 @@ HTTP
 <server>
 http
 </server>
- <name>
+<name>
 --fail-early
- </name>
- <command>
+</name>
+<command>
 --fail-early h1234://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test125 b/tests/data/test125
index 39b2b32ce725d3665ea84221103bdf262f8c7997..8de97c14e5304c14f767e23d25e79af839914866 100644 (file)
--- a/tests/data/test125
+++ b/tests/data/test125
@@ -17,10 +17,10 @@ REPLY CWD 314 bluah you f00l!
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP download, failed CWD
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/path/to/file/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1258 b/tests/data/test1258
index 5a4ce0b73bd0bc8005f080b6332a683bcbf4e269..ae4a33e4b2286b0244914244c63025b4d057995b 100644 (file)
--- a/tests/data/test1258
+++ b/tests/data/test1258
@@ -26,10 +26,10 @@ boo
 <server>
 http
 </server>
- <name>
+<name>
 HTTP, use cookies with localhost
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want?hoge=fuga -b non-existing -H "Host: localhost"
 </command>
 <features>

diff --git a/tests/data/test1259 b/tests/data/test1259
index 4e0c6d495fdc6dd1911cd40538f663e95c791c1e..3ef77ac81e8220d368b9e975653a1814f3e43df3 100644 (file)
--- a/tests/data/test1259
+++ b/tests/data/test1259
@@ -23,10 +23,10 @@ boo
 <server>
 http
 </server>
- <name>
+<name>
 HTTP URL with semicolon in password
- </name>
- <command>
+</name>
+<command>
 "http://user:pass;word@%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER"
 </command>
 </client>

diff --git a/tests/data/test126 b/tests/data/test126
index f1b252734307e69f433bbb379b8b92d3f7c7f8a6..b830fc77819fa68d6b58551284151328fff9aa02 100644 (file)
--- a/tests/data/test126
+++ b/tests/data/test126
@@ -22,10 +22,10 @@ RETRWEIRDO
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP download with multiple replies at once in RETR
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/blalbla/lululul/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1260 b/tests/data/test1260
index cff79e29882db43921b146f5e7c2c43a0fd20ccd..11cc13dfc9f793a0aea146460cf6525b1bf35c97 100644 (file)
--- a/tests/data/test1260
+++ b/tests/data/test1260
@@ -18,10 +18,10 @@ none
 <features>
 http
 </features>
- <name>
+<name>
 HTTP URL with rubbish after port number
- </name>
- <command>
+</name>
+<command>
 -g "http://[%HOSTIP]:%NOLISTENPORT:80/we/want/%TESTNUMBER" "http://%HOSTIP:%NOLISTENPORT:80/we/want/%TESTNUMBER" "http://user@example.com:80@localhost"
 </command>
 </client>

diff --git a/tests/data/test1261 b/tests/data/test1261
index 0fc3833a0b9c2fe66d34ad8d692c6916e252aa6d..17a8af82c03b5b0b4f7ea3968006f1d111cd57b1 100644 (file)
--- a/tests/data/test1261
+++ b/tests/data/test1261
@@ -26,10 +26,10 @@ This server reply is for testing a simple Location: following
 <server>
 http
 </server>
- <name>
+<name>
 'redirect_url' with --location and --max-redirs
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w '%{redirect_url}\n' --location --max-redirs 0
 </command>
 </client>

diff --git a/tests/data/test1262 b/tests/data/test1262
index 63abe8b8f084c0ce6d3f4ab288409f3c93d5f92a..0a7046ce9382c942efd95162dbefbd155bb70b46 100644 (file)
--- a/tests/data/test1262
+++ b/tests/data/test1262
@@ -19,10 +19,10 @@ RETR
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP request and denied to download an older file with -z
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -z "-1 jan 2001"
 </command>
 </client>

diff --git a/tests/data/test1263 b/tests/data/test1263
index ef42f20e0231569baa237ea5ea91506fcd460cc9..bed3b35ef50780f0b586b26894a52407c1eb6c92 100644 (file)
--- a/tests/data/test1263
+++ b/tests/data/test1263
@@ -19,10 +19,10 @@ none
 <features>
 http
 </features>
- <name>
+<name>
 HTTP URL with rubbish after IPv6 bracket
- </name>
- <command>
+</name>
+<command>
 -g "http://[%HOSTIP]test:%NOLISTENPORT/we/want/%TESTNUMBER" "http://[%HOSTIP][%HOSTIP]:%NOLISTENPORT/we/want/%TESTNUMBER" "http://user@[::1]@localhost"
 </command>
 </client>

diff --git a/tests/data/test1264 b/tests/data/test1264
index 54fb6ffa304e1c5c4f5301309f3e89c68cca4fca..e9ae4b50865d734216f4059f661455cd3895a88e 100644 (file)
--- a/tests/data/test1264
+++ b/tests/data/test1264
@@ -18,10 +18,10 @@ none
 <features>
 http
 </features>
- <name>
+<name>
 HTTP URL with space in host name
- </name>
- <command>
+</name>
+<command>
 -g "http://127.0.0.1 www.example.com/we/want/%TESTNUMBER"
 </command>
 </client>

diff --git a/tests/data/test1266 b/tests/data/test1266
index 2e72ae48623fc22caa1623f81f38099c0857d6c0..913c96cd552ae4ed83868f12ca1dd2063ba297f8 100644 (file)
--- a/tests/data/test1266
+++ b/tests/data/test1266
@@ -26,10 +26,10 @@ swsclose
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with a single-byte HTTP/0.9 response
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http0.9
 </command>
 </client>

diff --git a/tests/data/test1267 b/tests/data/test1267
index 920fc577f1d0e566025b95d5d475c77c990aee28..11b53650cbf276a46dc703c19b852f7b69f872e0 100644 (file)
--- a/tests/data/test1267
+++ b/tests/data/test1267
@@ -26,10 +26,10 @@ swsclose
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with a invalid HTTP/1 response line start
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http0.9
 </command>
 </client>

diff --git a/tests/data/test1268 b/tests/data/test1268
index 257b4726ed02496da38aed4c50c83d49bb5ee63d..806592fb8955170531f7ddcab2828a3753395a17 100644 (file)
--- a/tests/data/test1268
+++ b/tests/data/test1268
@@ -19,10 +19,10 @@ none
 <features>
 unix-sockets
 </features>
- <name>
+<name>
 file name argument looks like a flag
- </name>
- <command>
+</name>
+<command>
 --stderr %LOGDIR/moo%TESTNUMBER --unix-socket -k hej://moo
 </command>
 </client>

diff --git a/tests/data/test1269 b/tests/data/test1269
index f68cf9c09bda5f205953c1efdc7861ff8431d4b2..6cc68e0f007438a905bce005417aecbdbadd00d9 100644 (file)
--- a/tests/data/test1269
+++ b/tests/data/test1269
@@ -16,10 +16,10 @@
 <server>
 none
 </server>
- <name>
+<name>
 too large --retry-delay value
- </name>
- <command>
+</name>
+<command>
 --retry 3 --retry-delay 9223372036854776 http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test127 b/tests/data/test127
index 0b0f4f5983eea847e7d1dd69ec1488406436bcda..ebf122d018e4c60e98851fb564b90fec878bafd9 100644 (file)
--- a/tests/data/test127
+++ b/tests/data/test127
@@ -19,10 +19,10 @@ moooooooo
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP --disable-epsv
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/path/to/file/%TESTNUMBER --disable-epsv
 </command>
 </client>

diff --git a/tests/data/test1270 b/tests/data/test1270
index 0c289d0cffdc66e171a5ef1af355e592570bebca..1e1fa67bb54f5fc5f2d2bca6ba496efa0c42ee4b 100644 (file)
--- a/tests/data/test1270
+++ b/tests/data/test1270
@@ -31,10 +31,10 @@ Connection: close
 <server>
 http
 </server>
- <name>
+<name>
 Basic 'redirect_url'
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w '%{redirect_url}\n' -s
 </command>
 </client>

diff --git a/tests/data/test1271 b/tests/data/test1271
index 2d412a6bf75546c8c6eeec5204fb1fa83429a929..3cc994b716d24ad2012ff4984bd51d4947725c67 100644 (file)
--- a/tests/data/test1271
+++ b/tests/data/test1271
@@ -23,10 +23,10 @@ Moo
 <server>
 http
 </server>
- <name>
+<name>
 --write-out from file with empty file
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w @%LOGDIR/blank%TESTNUMBER
 </command>
 <file name="%LOGDIR/blank%TESTNUMBER">

diff --git a/tests/data/test1272 b/tests/data/test1272
index 39c62901e25836ee820ff99f6d2b34e601e8bf9a..921242892730c60f22330394f0096f3d45c27887 100644 (file)
--- a/tests/data/test1272
+++ b/tests/data/test1272
@@ -25,10 +25,10 @@ gophers
 <killserver>
 gophers
 </killserver>
- <name>
+<name>
 Gophers index
- </name>
- <command>
+</name>
+<command>
 -k gophers://%HOSTIP:%GOPHERSPORT/1/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1273 b/tests/data/test1273
index d724fdd8430d50aa26f75689af1ecfc801b76dfe..fb5d47b2d409779ecab00713e9bfeba08380452c 100644 (file)
--- a/tests/data/test1273
+++ b/tests/data/test1273
@@ -47,10 +47,10 @@ http
 <killserver>
 http
 </killserver>
- <name>
+<name>
 -f and resume transfer of an entirely-downloaded file
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C - -f
 </command>
 <file name="%LOGDIR/curl%TESTNUMBER.out">

diff --git a/tests/data/test1274 b/tests/data/test1274
index 5198537876fdb25cec977f69929d441bb07f878a..db37f656d6c8af7fe052b916df1498db555c4f64 100644 (file)
--- a/tests/data/test1274
+++ b/tests/data/test1274
@@ -32,10 +32,10 @@ Connection:
 <server>
 http
 </server>
- <name>
+<name>
 HTTP header line folding
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/out%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1276 b/tests/data/test1276
index 2526cdf948c13057e0ed24839dfeac0e6a42e3cc..3961bf4cb10b14e5912b7bed746f7fc52a5a9c4a 100644 (file)
--- a/tests/data/test1276
+++ b/tests/data/test1276
@@ -13,9 +13,9 @@ documentation
 none
 </server>
 
- <name>
+<name>
 Verify lib/optiontable.pl
- </name>
+</name>
 
 <command type="perl">
 %SRCDIR/option-check.pl %SRCDIR/..

diff --git a/tests/data/test1277 b/tests/data/test1277
index b705569d06d4ca597d67a769c308bac49873a250..d80f671fa7a90096320c361741d4f058ededd761 100644 (file)
--- a/tests/data/test1277
+++ b/tests/data/test1277
@@ -178,10 +178,10 @@ libz
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with both content and transfer encoding
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding --compressed
 </command>
 </client>

diff --git a/tests/data/test1279 b/tests/data/test1279
index b0521052e4fc720dc479ad2496ee704f962bad62..fd3b34bd30994b213eaa10b3c10f8d8d100dc010 100644 (file)
--- a/tests/data/test1279
+++ b/tests/data/test1279
@@ -14,9 +14,9 @@ libcurl.def
 none
 </server>
 
- <name>
+<name>
 Verify libcurl.def against CURL_EXTERN declarations
- </name>
+</name>
 
 <command type="perl">
 %SRCDIR/extern-scan.pl --heading=EXPORTS --sort %SRCDIR/..

diff --git a/tests/data/test128 b/tests/data/test128
index e3ed4157bdc5850ec691d9580aaac1aaa792a438..d1a5d2acff5619688f631920e19f6adc4e996001 100644 (file)
--- a/tests/data/test128
+++ b/tests/data/test128
@@ -16,10 +16,10 @@ STOR
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP upload with --crlf
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER --crlf
 </command>
 <file name="%LOGDIR/upload%TESTNUMBER">

diff --git a/tests/data/test1280 b/tests/data/test1280
index 3f5bdd5bb7a901284cc578bb1e21b2421af5b948..081cbbe547a182d0161ffb5769af10dee5558542 100644 (file)
--- a/tests/data/test1280
+++ b/tests/data/test1280
@@ -23,10 +23,10 @@ bytes
 <server>
 http
 </server>
- <name>
+<name>
 simple [a-d] globbing
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/[a-d]/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1281 b/tests/data/test1281
index f6781d4604f675a6a8c0165071e7a6a367188ef4..a0bca73eabdf6395474548398a9bbb9707b7b317 100644 (file)
--- a/tests/data/test1281
+++ b/tests/data/test1281
@@ -20,10 +20,10 @@ none
 <features>
 http
 </features>
- <name>
+<name>
 reject non-numerical port number in URL
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:alpha/beta/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1282 b/tests/data/test1282
index 76e7a000e3269d28198feaeaf1003920f3d07ebf..f57275187f2e4026e37dbffe6e364aebe271d678 100644 (file)
--- a/tests/data/test1282
+++ b/tests/data/test1282
@@ -21,10 +21,10 @@ ftp
 <features>
 GSS-API
 </features>
- <name>
+<name>
 FTP with 633 response before gss initialized
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 

diff --git a/tests/data/test129 b/tests/data/test129
index 6da58be2d42b7ac9dc8fcbda250c0e5ccde30771..22e071d3e15bb8c90d911e15bb633ba6dca994d6 100644 (file)
--- a/tests/data/test129
+++ b/tests/data/test129
@@ -31,10 +31,10 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 HTTP/1.2 is rejected
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1292 b/tests/data/test1292
index 8b8806e413be11ad22059bd8674fa398ad15c2cc..e674bfd89c1dfdb193627a27b409d6f09bb562ee 100644 (file)
--- a/tests/data/test1292
+++ b/tests/data/test1292
@@ -26,10 +26,10 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 Replaced internal headers with a blank one
- </name>
- <command>
+</name>
+<command>
  -H "Host;" -H "Accept;" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1293 b/tests/data/test1293
index b4977b8d65202082ad683a4c221d82747bed8637..afecfaf2f9bc508c7dd931107ac61b153c512456 100644 (file)
--- a/tests/data/test1293
+++ b/tests/data/test1293
@@ -35,10 +35,10 @@ Mime
 <server>
 http
 </server>
- <name>
+<name>
 Multipart formpost to two URLs, the first failing
- </name>
- <command>
+</name>
+<command>
 http://0 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -F=
 </command>
 </client>

diff --git a/tests/data/test1298 b/tests/data/test1298
index 2afefac5d36bde0acc6ee01c5c8869859e0cfbe9..cebe4a9f71f694841b97cdc54980efc45bb57323 100644 (file)
--- a/tests/data/test1298
+++ b/tests/data/test1298
@@ -31,10 +31,10 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET special path with --request-target
- </name>
- <command>
+</name>
+<command>
 --request-target "XXX" "http://%HOSTIP:%HTTPPORT/" -H "Testno: %TESTNUMBER"
 </command>
 </client>

diff --git a/tests/data/test1299 b/tests/data/test1299
index 7f3e80e0c7f955c33e04238e49d2ecf9270466aa..11ac0c41f7ebf745e42559bb239a3ce9071d14a6 100644 (file)
--- a/tests/data/test1299
+++ b/tests/data/test1299
@@ -30,10 +30,10 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 Send "OPTIONS *" with --request-target
- </name>
- <command>
+</name>
+<command>
 --request-target '*' -X OPTIONS http://%HOSTIP:%HTTPPORT/ -H "Testno: %TESTNUMBER"
 </command>
 </client>

diff --git a/tests/data/test13 b/tests/data/test13
index 72dd191007d498e57ded145f1ee1d3b834e8e4e8..b8bcf164944ed8952ac41715860a7b12cfb2d0d7 100644 (file)
--- a/tests/data/test13
+++ b/tests/data/test13
@@ -21,10 +21,10 @@ blabla custom request result
 <server>
 http
 </server>
- <name>
+<name>
 HTTP custom request 'DELETE'
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -X DELETE
 </command>
 </client>

diff --git a/tests/data/test130 b/tests/data/test130
index 665d0590f0569a81303a0b369b9c86a7bc0eb189..d6fed33676f2b33e5039c6019a2a18856f8017e6 100644 (file)
--- a/tests/data/test130
+++ b/tests/data/test130
@@ -33,10 +33,10 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP (optional .netrc; no user/pass) dir list PASV
- </name>
- <command>
+</name>
+<command>
 --netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER ftp://%HOSTIP:%FTPPORT/
 </command>
 <file name="%LOGDIR/netrc%TESTNUMBER" >

diff --git a/tests/data/test1300 b/tests/data/test1300
index 11834121301c70076c93574da3e082185be32ab4..1c1ec7bf8eb1d93cbbea73112c4a26b71474868b 100644 (file)
--- a/tests/data/test1300
+++ b/tests/data/test1300
@@ -15,8 +15,8 @@ none
 <features>
 unittest
 </features>
- <name>
+<name>
 llist unit tests
- </name>
+</name>
 </client>
 </testcase>

diff --git a/tests/data/test1301 b/tests/data/test1301
index 08b43a8ecc1e506368ff70e6fca9dc8d5a02f17b..ad6113e56dc957c31c2385cc6dcc7cf59b86078e 100644 (file)
--- a/tests/data/test1301
+++ b/tests/data/test1301
@@ -14,8 +14,8 @@ none
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 curl_strequal tests
- </name>
+</name>
 </client>
 </testcase>

diff --git a/tests/data/test1302 b/tests/data/test1302
index 9e9039cac6ce129569aed4f5807b27141b056841..22102413b3722318d808eb3b6530d78515fe9a49 100644 (file)
--- a/tests/data/test1302
+++ b/tests/data/test1302
@@ -15,8 +15,8 @@ none
 <features>
 unittest
 </features>
- <name>
+<name>
 base64 encode/decode unit tests
- </name>
+</name>
 </client>
 </testcase>

diff --git a/tests/data/test1303 b/tests/data/test1303
index bb23352df13a27dc82226689b5d554ddaf3e0689..2e12ae43ffd53b13ae2a90356e8625180e0058d3 100644 (file)
--- a/tests/data/test1303
+++ b/tests/data/test1303
@@ -15,8 +15,8 @@ none
 <features>
 unittest
 </features>
- <name>
+<name>
 Curl_timeleft unit tests
- </name>
+</name>
 </client>
 </testcase>

diff --git a/tests/data/test1304 b/tests/data/test1304
index a7de1d52fe180e0aa1108b2cbb7913a07a63936b..da36ed1a03e1c430a17591e32899207bdf19e690 100644 (file)
--- a/tests/data/test1304
+++ b/tests/data/test1304
@@ -16,9 +16,9 @@ none
 unittest
 netrc
 </features>
- <name>
+<name>
 netrc parsing unit tests
- </name>
+</name>
 <command>
 %LOGDIR/netrc%TESTNUMBER
 </command>

diff --git a/tests/data/test1305 b/tests/data/test1305
index 7d14aa8491ce4e10fc78052bdf3a565a244800f7..3765f80a0de5d735b7e51326f420d2ae795ec24a 100644 (file)
--- a/tests/data/test1305
+++ b/tests/data/test1305
@@ -16,9 +16,9 @@ none
 <features>
 unittest
 </features>
- <name>
+<name>
 internal hash create/destroy testing
- </name>
+</name>
 <command>
 %TESTNUMBER
 </command>

diff --git a/tests/data/test1306 b/tests/data/test1306
index 7ed450324d3e90dd1aa89d421ed06aa86c4b0e7d..6588fe7fcde6bf7cadb548fd89c57e14319e95b5 100644 (file)
--- a/tests/data/test1306
+++ b/tests/data/test1306
@@ -16,9 +16,9 @@ none
 <features>
 unittest
 </features>
- <name>
+<name>
 internal hash create/add/destroy testing
- </name>
+</name>
 <tool>
 unit1305
 </tool>

diff --git a/tests/data/test1307 b/tests/data/test1307
index f0e96bfa0111cd1c3fc7b6bd0494bbe92210ee20..cf4a4ac1a660881fe8c05c20fd9e0f850b57ddc1 100644 (file)
--- a/tests/data/test1307
+++ b/tests/data/test1307
@@ -17,8 +17,8 @@ none
 unittest
 ftp
 </features>
- <name>
+<name>
 internal Curl_fnmatch() testing
- </name>
+</name>
 </client>
 </testcase>

diff --git a/tests/data/test1308 b/tests/data/test1308
index bc799883fa271a2ca64ad53f2a792ae93f2b7ba0..d05e3bdfb17378594981476e457fb1a9cdecd3e2 100644 (file)
--- a/tests/data/test1308
+++ b/tests/data/test1308
@@ -19,9 +19,9 @@ form-api
 <server>
 none
 </server>
- <name>
+<name>
 formpost unit tests
- </name>
+</name>
 <command>
 %LOGDIR/test-%TESTNUMBER
 </command>

diff --git a/tests/data/test1309 b/tests/data/test1309
index 7005d5f13c72114ee68d18b0d65f8ba8bade0132..4b86377fb373a8ff7216e097e34db00ffa07b19e 100644 (file)
--- a/tests/data/test1309
+++ b/tests/data/test1309
@@ -15,9 +15,9 @@ none
 <features>
 unittest
 </features>
- <name>
+<name>
 splay unit tests
- </name>
+</name>
 </client>
 
 <verify>

diff --git a/tests/data/test131 b/tests/data/test131
index 52bff92d4b3747b1fc8712752de513b51f903931..c48931175c483569bc7342aec9a2cdd2785ac0d2 100644 (file)
--- a/tests/data/test131
+++ b/tests/data/test131
@@ -34,10 +34,10 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP (optional .netrc; user/no pass) dir list PASV
- </name>
- <command>
+</name>
+<command>
 --netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER ftp://user2@%HOSTIP:%FTPPORT/
 </command>
 <file name="%LOGDIR/netrc%TESTNUMBER" >

diff --git a/tests/data/test1310 b/tests/data/test1310
index f0d47e74ffda946c0729d8b3264df0a1915304d2..12fdbb1580eec4d4d0c255da29d573427224a37f 100644 (file)
--- a/tests/data/test1310
+++ b/tests/data/test1310
@@ -61,9 +61,9 @@ debug
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with NTLM delegation to winbind helper
- </name>
+</name>
  <setenv>
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
@@ -78,7 +78,7 @@ CURL_NTLM_LOGDIR=%LOGDIR
 # set the test number
 CURL_NTLM_AUTH_TESTNUM=%TESTNUMBER
  </setenv>
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:anypasswd --ntlm-wb
 </command>
 <precheck>

diff --git a/tests/data/test1314 b/tests/data/test1314
index 343a1c2407dd8dea228f890789d26d0e03168c60..40cd18971cba296c140fb465215ccf355cca98cb 100644 (file)
--- a/tests/data/test1314
+++ b/tests/data/test1314
@@ -50,10 +50,10 @@ moo
 <server>
 http
 </server>
- <name>
+<name>
 HTTP Location: following a // prefixed url
- </name>
- <command>
+</name>
+<command>
 http://firstplace.example.com/want/%TESTNUMBER -L -x http://%HOSTIP:%HTTPPORT
 </command>
 <features>

diff --git a/tests/data/test1315 b/tests/data/test1315
index 22135eb199c656b1803985afde618b485228ea16..94b3c4897098952c5dd0bb99669689e3747f741d 100644 (file)
--- a/tests/data/test1315
+++ b/tests/data/test1315
@@ -28,10 +28,10 @@ Mime
 <server>
 http
 </server>
- <name>
+<name>
 HTTP RFC1867-type formposting - -F with three files, one with explicit type
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F name=value -F 'file=@%LOGDIR/test%TESTNUMBER.txt,%LOGDIR/test%TESTNUMBER.txt;type=magic/content,%LOGDIR/test%TESTNUMBER.txt'
 </command>
 # We create this file before the command is invoked!

diff --git a/tests/data/test1316 b/tests/data/test1316
index 935c46798415bcc65310c87516644e25b04235f8..b6b8a18969133b0a235f573aa3293c710e5a2452 100644 (file)
--- a/tests/data/test1316
+++ b/tests/data/test1316
@@ -57,10 +57,10 @@ http-proxy
 <features>
 http
 </features>
- <name>
+<name>
 FTP LIST tunneled through HTTP proxy
- </name>
- <command>
+</name>
+<command>
 ftp://ftp.%TESTNUMBER:%FTPPORT/ -p -x %HOSTIP:%PROXYPORT
 </command>
 </client>

diff --git a/tests/data/test1318 b/tests/data/test1318
index 0844852e9b07fdb28810d37a88abdef8910ecb21..b7cc434eb3af877737da982d8c2a89db19533348 100644 (file)
--- a/tests/data/test1318
+++ b/tests/data/test1318
@@ -32,10 +32,10 @@ Content-Length: 0
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with --resolve and same host name using different cases
- </name>
- <command>
+</name>
+<command>
 --resolve MiXeDcAsE.cOm:%HTTPPORT:%HOSTIP http://MiXeDcAsE.cOm:%HTTPPORT/%TESTNUMBER http://mixedcase.com:%HTTPPORT/%TESTNUMBER0001
 </command>
 </client>

diff --git a/tests/data/test1319 b/tests/data/test1319
index ea11925240c881cedf4aab0aeeb4e921c6ed161c..2dd8870955b4a839c925a40e445b30236d93f149 100644 (file)
--- a/tests/data/test1319
+++ b/tests/data/test1319
@@ -52,10 +52,10 @@ http-proxy
 http
 proxy
 </features>
- <name>
+<name>
 POP3 fetch tunneled through HTTP proxy
- </name>
- <command>
+</name>
+<command>
 pop3://pop.%TESTNUMBER:%POP3PORT/%TESTNUMBER -p -x %HOSTIP:%PROXYPORT -u user:secret
 </command>
 </client>

diff --git a/tests/data/test132 b/tests/data/test132
index b02d9939992c9a123574f495fb05c09b1247b5c5..8aa2f7906a991e94a7e5c0d00905eea158304109 100644 (file)
--- a/tests/data/test132
+++ b/tests/data/test132
@@ -33,10 +33,10 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP (optional .netrc; user/passwd supplied) dir list PASV
- </name>
- <command>
+</name>
+<command>
 --netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER ftp://mary:mark@%HOSTIP:%FTPPORT/
 </command>
 <file name="%LOGDIR/netrc%TESTNUMBER" >

diff --git a/tests/data/test1320 b/tests/data/test1320
index 7b43382b98eac07c75fbdc2aebe8e572b2396a70..9237ea5722e7f93952f9f8c628735c2a631e92c1 100644 (file)
--- a/tests/data/test1320
+++ b/tests/data/test1320
@@ -29,16 +29,16 @@ http-proxy
 http
 proxy
 </features>
- <name>
+<name>
 SMTP send tunneled through HTTP proxy
- </name>
+</name>
 <stdin>
 From: different\r
 To: another\r
 \r
 body\r
 </stdin>
- <command>
+<command>
 smtp://smtp.%TESTNUMBER:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T - -p -x %HOSTIP:%PROXYPORT
 </command>
 </client>

diff --git a/tests/data/test1321 b/tests/data/test1321
index 88d865e7bb9c09b90f7f6e0017400be984016477..4fe83fefbb72eedc0d6b6ffdca53aa642d1c7e4f 100644 (file)
--- a/tests/data/test1321
+++ b/tests/data/test1321
@@ -48,10 +48,10 @@ http-proxy
 http
 proxy
 </features>
- <name>
+<name>
 IMAP FETCH tunneled through HTTP proxy
- </name>
- <command>
+</name>
+<command>
 'imap://imap.%TESTNUMBER:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret -p -x %HOSTIP:%PROXYPORT
 </command>
 </client>

diff --git a/tests/data/test1325 b/tests/data/test1325
index dea2b2a1163f34fa190d40f70231e79db4799346..67b31d58fe7fe9a726c27822fad1af7b46bb0d95 100644 (file)
--- a/tests/data/test1325
+++ b/tests/data/test1325
@@ -47,10 +47,10 @@ body
 <server>
 http
 </server>
- <name>
+<name>
 HTTP 308-redirect with POST
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/%TESTNUMBER -L -d "moo"
 </command>
 </client>

diff --git a/tests/data/test1326 b/tests/data/test1326
index 22c49cf4728cef1e5ba4fd74fa0bb84bf1547c16..89e5a79c73585a17371fa0478986d2bfff1de63e 100644 (file)
--- a/tests/data/test1326
+++ b/tests/data/test1326
@@ -25,14 +25,14 @@ http
 <features>
 telnet
 </features>
- <name>
+<name>
 TELNET to HTTP server
- </name>
+</name>
 <stdin>
 GET /we/want/%TESTNUMBER HTTP/1.0\r
 \r
 </stdin>
- <command>
+<command>
 telnet://%HOSTIP:%HTTPPORT --upload-file -
 </command>
 </client>

diff --git a/tests/data/test1327 b/tests/data/test1327
index 5941e5005ee03c8d98409b9d7d537496e8c4af25..c54f2a8898ebef2bbdbdc13f4b130bed3fef99aa 100644 (file)
--- a/tests/data/test1327
+++ b/tests/data/test1327
@@ -20,9 +20,9 @@ http
 <features>
 telnet
 </features>
- <name>
+<name>
 TELNET check of upload with stdout redirected
- </name>
+</name>
 <stdin>
 GET /ignore/for/%TESTNUMBER HTTP/1.0\r
 \r

diff --git a/tests/data/test1328 b/tests/data/test1328
index 5055a077035ad13e19c4ecf00c20a63130d97ec5..8466abde67ce597c1f9a9cd5931e6960fb196903 100644 (file)
--- a/tests/data/test1328
+++ b/tests/data/test1328
@@ -43,10 +43,10 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET a globbed range with -f
- </name>
- <command>
+</name>
+<command>
 -f 'http://%HOSTIP:%HTTPPORT/[%TESTNUMBER0000-%TESTNUMBER0001]' -o %LOGDIR/#1
 </command>
 </client>

diff --git a/tests/data/test1329 b/tests/data/test1329
index 0ca5b5aae307f5c733dfa0c5fdf7c4609ad56bab..8f1740bb7bc4a751d4c29504726e53660701fe96 100644 (file)
--- a/tests/data/test1329
+++ b/tests/data/test1329
@@ -11,10 +11,10 @@ HTTP proxy
 <server>
 http
 </server>
- <name>
+<name>
 /-prefixed proxy name
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER -x "/server"
 </command>
 <features>

diff --git a/tests/data/test133 b/tests/data/test133
index 8b914cb713f5505d6c5c178e6c42df28f824b612..c8d2f9039e3e71c1be1e8bda40008fdbfe105886 100644 (file)
--- a/tests/data/test133
+++ b/tests/data/test133
@@ -33,10 +33,10 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP compulsory .netrc; ignore passwd in URL
- </name>
- <command>
+</name>
+<command>
 -n --netrc-file %LOGDIR/netrc%TESTNUMBER ftp://mary:mark@%HOSTIP:%FTPPORT/
 </command>
 <file name="%LOGDIR/netrc%TESTNUMBER" >

diff --git a/tests/data/test1331 b/tests/data/test1331
index a233c63c4e7abc8f8fd69573204d167c25cc83a4..35598960e317e026f9834d01942895b1e3216a6b 100644 (file)
--- a/tests/data/test1331
+++ b/tests/data/test1331
@@ -58,10 +58,10 @@ hello
 <server>
 http
 </server>
- <name>
+<name>
 HTTP --proxy-anyauth and 407 with cookies
- </name>
- <command>
+</name>
+<command>
 -U myname:mypassword -x %HOSTIP:%HTTPPORT http://z.x.com/%TESTNUMBER --proxy-anyauth -c %LOGDIR/dump%TESTNUMBER
 </command>
 <features>

diff --git a/tests/data/test1332 b/tests/data/test1332
index b7d201be0ba9efe3be49c4632e1b613606c45ab5..835294082329d714a40cfa7ca5488884b410b10a 100644 (file)
--- a/tests/data/test1332
+++ b/tests/data/test1332
@@ -46,10 +46,10 @@ body
 <server>
 http
 </server>
- <name>
+<name>
 HTTP POST with 303 redirect and --post303
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d "moo" --post303
 </command>
 </client>

diff --git a/tests/data/test1333 b/tests/data/test1333
index 0a991e48b26f8d8e41a8d1929f5f4acbe0cf0715..e6dbb73a62fff9a554a6cf7028580f67915dabbb 100644 (file)
--- a/tests/data/test1333
+++ b/tests/data/test1333
@@ -27,10 +27,10 @@ Connection: close
 <server>
 http
 </server>
- <name>
+<name>
 HTTP POST zero length, chunked-encoded
- </name>
- <command>
+</name>
+<command>
 -d "" --header "Transfer-Encoding: chunked" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test135 b/tests/data/test135
index 353735d6a4fa1f5e871d99c7c4d00c197e68e04e..3dc1d531f5b351c882cb5282f31b7c343f190d48 100644 (file)
--- a/tests/data/test135
+++ b/tests/data/test135
@@ -28,10 +28,10 @@ Range
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP retrieve a byte-range
- </name>
- <command>
+</name>
+<command>
 -r 4-16 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test136 b/tests/data/test136
index 63d936b5400d6d459f8a1f5a8746272e20d48552..ef0b2c49ac74c4ca12b05e45bda18d27152e5d70 100644 (file)
--- a/tests/data/test136
+++ b/tests/data/test136
@@ -18,10 +18,10 @@ RETR
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP with user and no password
- </name>
- <command>
+</name>
+<command>
 -u user: ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test137 b/tests/data/test137
index 7766f09ff50d39fc65ab916531fe353972891f74..33b93589ec3699cdb351c3d782e794898bd53cad 100644 (file)
--- a/tests/data/test137
+++ b/tests/data/test137
@@ -21,10 +21,10 @@ RETRNOSIZE
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP download without size in RETR string
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/blalbla/lululul/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test138 b/tests/data/test138
index f70eb078e9344caf77d698c3d1a4c335ae06d63e..db3b6ec7df268ae3727fe22676066b07ffe84204 100644 (file)
--- a/tests/data/test138
+++ b/tests/data/test138
@@ -24,10 +24,10 @@ REPLY SIZE 500 command not understood
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP download without size in RETR string and no SIZE command
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/blalbla/lululul/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test139 b/tests/data/test139
index ab04953c508ee0c3a656e4318c080a74a7ff8e62..160f628e2cb0f9a8ca7478a78fe03143bb5695d8 100644 (file)
--- a/tests/data/test139
+++ b/tests/data/test139
@@ -21,10 +21,10 @@ this is file contents
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP download a newer file with -z
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -z "1 jan 1989"
 </command>
 </client>

diff --git a/tests/data/test1394 b/tests/data/test1394
index d3ffb2d33fa03ef22855795ef237a7c633b57993..30be0c85a75e7b979d334e58b4b4d5690cba3200 100644 (file)
--- a/tests/data/test1394
+++ b/tests/data/test1394
@@ -14,9 +14,9 @@ none
 <features>
 unittest
 </features>
- <name>
+<name>
 unit test for parse_cert_parameter()
- </name>
+</name>
 </client>
 
 <verify>

diff --git a/tests/data/test1395 b/tests/data/test1395
index 409e0d631ba11462689f9a7019031685cbac0627..a73e043ca5b80a0bf26c4bbe8e8853f863abf823 100644 (file)
--- a/tests/data/test1395
+++ b/tests/data/test1395
@@ -14,8 +14,8 @@ none
 <features>
 unittest
 </features>
- <name>
+<name>
 Curl_dedotdotify
- </name>
+</name>
 </client>
 </testcase>

diff --git a/tests/data/test1396 b/tests/data/test1396
index d8b432d8b10c2abb1c77523cfb7fb729ee90b65c..d65ab25520fba1ff33bf1cabd8505249980b7c56 100644 (file)
--- a/tests/data/test1396
+++ b/tests/data/test1396
@@ -16,9 +16,9 @@ none
 <features>
 unittest
 </features>
- <name>
+<name>
 curl_easy_escape and curl_easy_unescape
- </name>
+</name>
 </client>
 
 </testcase>

diff --git a/tests/data/test1398 b/tests/data/test1398
index 436cac82d4b63a0df6a23bb2712df4b12d7328df..f77e3217496c4f6c22595b9edc99a959a1782d15 100644 (file)
--- a/tests/data/test1398
+++ b/tests/data/test1398
@@ -15,9 +15,9 @@ none
 <features>
 unittest
 </features>
- <name>
+<name>
 curl_msnprintf unit tests
- </name>
+</name>
 </client>
 
 </testcase>

diff --git a/tests/data/test1399 b/tests/data/test1399
index 6d6ec7a5b048cfc2dc65661401013eb743b4be50..f8a7c19bb48ccd1c4de33c683362929717be8298 100644 (file)
--- a/tests/data/test1399
+++ b/tests/data/test1399
@@ -15,8 +15,8 @@ none
 <features>
 unittest
 </features>
- <name>
+<name>
 Curl_pgrsTime unit tests
- </name>
+</name>
 </client>
 </testcase>

diff --git a/tests/data/test14 b/tests/data/test14
index f2bf61004eaceeda08a56dfd54420864ecc17903..1bffda78d75f2e0b13d346867a36f4be79f5fc68 100644 (file)
--- a/tests/data/test14
+++ b/tests/data/test14
@@ -20,10 +20,10 @@ Connection: close
 <server>
 http
 </server>
- <name>
+<name>
 HTTP HEAD with Connection: close
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -i --head
 </command>
 </client>

diff --git a/tests/data/test140 b/tests/data/test140
index 36a01cc1c2fc1eb7473d3b505c4b6aa9be512191..5e29f5c7c758515381422b68a28077a2eb649440 100644 (file)
--- a/tests/data/test140
+++ b/tests/data/test140
@@ -20,10 +20,10 @@ FTP
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP download file with -z, expected to not transfer
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -z "1 jan 2004"
 </command>
 </client>

diff --git a/tests/data/test1400 b/tests/data/test1400
index 837a20b09326115191e0a517c7ef7119375894d3..2264771605e10dc3c1ee4b96769e36f4123079ad 100644 (file)
--- a/tests/data/test1400
+++ b/tests/data/test1400
@@ -24,13 +24,13 @@ Connection: close
 <server>
 http
 </server>
- <name>
+<name>
 --libcurl for simple HTTP GET
- </name>
+</name>
 <setenv>
 SSL_CERT_FILE=
 </setenv>
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl %LOGDIR/test%TESTNUMBER.c
 </command>
 </client>

diff --git a/tests/data/test1401 b/tests/data/test1401
index 17065459153c59ae5fc73c158ae102e0965b41af..d7b15776a16b5dd8d72d494ba1872321db977217 100644 (file)
--- a/tests/data/test1401
+++ b/tests/data/test1401
@@ -28,9 +28,9 @@ Connection: close
 <server>
 http
 </server>
- <name>
+<name>
 --libcurl for GET with various options
- </name>
+</name>
 <features>
 http
 ftp
@@ -39,7 +39,7 @@ file
 <setenv>
 SSL_CERT_FILE=
 </setenv>
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl %LOGDIR/test%TESTNUMBER.c --basic -u fake:user -H "X-Files: Mulder" -H "X-Men: cyclops, iceman" -A MyUA -b chocolate=chip --proto "=http,ftp,file"
 </command>
 </client>

diff --git a/tests/data/test1402 b/tests/data/test1402
index 5003ba8f3e2d752c29e60b5ee8aa20b88e623559..6332fa168c1d0da9d7d9d0c9e0f9f06b5a0f9216 100644 (file)
--- a/tests/data/test1402
+++ b/tests/data/test1402
@@ -25,13 +25,13 @@ Connection: close
 <server>
 http
 </server>
- <name>
+<name>
 --libcurl for simple POST
- </name>
+</name>
 <setenv>
 SSL_CERT_FILE=
 </setenv>
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl %LOGDIR/test%TESTNUMBER.c -d "foo=bar" -d "baz=quux"
 </command>
 </client>

diff --git a/tests/data/test1403 b/tests/data/test1403
index 3eab6222d5917fc6ab38df73d4ef574d495b55eb..fb4882c6378c00b907e465a08f50512d75924e21 100644 (file)
--- a/tests/data/test1403
+++ b/tests/data/test1403
@@ -25,13 +25,13 @@ Connection: close
 <server>
 http
 </server>
- <name>
+<name>
 --libcurl for GET with query
- </name>
+</name>
 <setenv>
 SSL_CERT_FILE=
 </setenv>
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl %LOGDIR/test%TESTNUMBER.c -G -d "foo=bar" -d "baz=quux"
 </command>
 </client>

diff --git a/tests/data/test1404 b/tests/data/test1404
index 5df73ae4e5fe901566c12fb81eeab2bdb7834a01..648b7b2838b9d2f7a5f489af3efda7f7adc00440 100644 (file)
--- a/tests/data/test1404
+++ b/tests/data/test1404
@@ -29,13 +29,13 @@ Mime
 <server>
 http
 </server>
- <name>
+<name>
 --libcurl for HTTP RFC1867-type formposting - -F with 3 files, one with explicit type & encoder
- </name>
+</name>
 <setenv>
 SSL_CERT_FILE=
 </setenv>
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F name=value -F 'file=@%LOGDIR/test%TESTNUMBER.txt,%LOGDIR/test%TESTNUMBER.txt;type=magic/content;encoder=8bit,%LOGDIR/test%TESTNUMBER.txt;headers=X-testheader-1: header 1;headers=X-testheader-2: header 2' --libcurl %LOGDIR/test%TESTNUMBER.c
 </command>
 # We create this file before the command is invoked!

diff --git a/tests/data/test1405 b/tests/data/test1405
index 5bb0450e63248add421aa42829c7b5c52c0252e7..8a13a688aa3ece742f1951be74ad9a35702d70fb 100644 (file)
--- a/tests/data/test1405
+++ b/tests/data/test1405
@@ -29,13 +29,13 @@ REPLY FAIL 500 this might not be a failure!
 <server>
 ftp
 </server>
- <name>
+<name>
 --libcurl for FTP with quote ops
- </name>
+</name>
 <setenv>
 SSL_CERT_FILE=
 </setenv>
- <command>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "NOOP 1" -Q "+NOOP 2" -Q "-NOOP 3" -Q "*FAIL" -Q "+*FAIL HARD" --libcurl %LOGDIR/test%TESTNUMBER.c
 </command>
 </client>

diff --git a/tests/data/test1406 b/tests/data/test1406
index 3a00b44db4c7c698807244b40112b1427b7964d4..235155038aacc9b48e5a244691273d71ce775031 100644 (file)
--- a/tests/data/test1406
+++ b/tests/data/test1406
@@ -22,9 +22,9 @@ CAPA SIZE
 <server>
 smtp
 </server>
- <name>
+<name>
 --libcurl for SMTP
- </name>
+</name>
 <setenv>
 SSL_CERT_FILE=
 </setenv>
@@ -34,7 +34,7 @@ To: another
 \r
 body\r
 </file>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient.one@example.com --mail-rcpt recipient.two@example.com --mail-from sender@example.com -T %LOGDIR/test%TESTNUMBER.eml --libcurl %LOGDIR/test%TESTNUMBER.c
 </command>
 </client>

diff --git a/tests/data/test1407 b/tests/data/test1407
index 160c86449e270520302554b965063e9140503a64..c8b880a23015d11c0bbff063472d673c6512abe1 100644 (file)
--- a/tests/data/test1407
+++ b/tests/data/test1407
@@ -23,9 +23,9 @@ REPLY LIST +OK %TESTNUMBER 100\r\n.
 <server>
 pop3
 </server>
- <name>
+<name>
 --libcurl for POP3 LIST one message
- </name>
+</name>
 <setenv>
 SSL_CERT_FILE=
 </setenv>

diff --git a/tests/data/test1408 b/tests/data/test1408
index e27923ad76a192025cf85862500884648c5bb81a..925be875b6463bb2f07e6110bd848d169ef1924d 100644 (file)
--- a/tests/data/test1408
+++ b/tests/data/test1408
@@ -45,10 +45,10 @@ ipv6
 <server>
 http-ipv6
 </server>
- <name>
+<name>
 HTTP receive cookies over IPV6
- </name>
- <command>
+</name>
+<command>
 -c %LOGDIR/jar%TESTNUMBER -g http://%HOST6IP:%HTTP6PORT/path/%TESTNUMBER0001 http://%HOST6IP:%HTTP6PORT/path/%TESTNUMBER0002
 </command>
 </client>

diff --git a/tests/data/test1409 b/tests/data/test1409
index 120bf3cf39c54ea031ba8458f8a66f86453179b8..6e248ca10bba1949929ae29b74f636e9a464b856 100644 (file)
--- a/tests/data/test1409
+++ b/tests/data/test1409
@@ -13,10 +13,10 @@ FAILURE
 <server>
 none
 </server>
- <name>
+<name>
 Pass in string to -C
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER -C wrong
 </command>
 </client>

diff --git a/tests/data/test141 b/tests/data/test141
index 3fff42d9b306a6205927d8eed722d7e4f4ad1b7d..425a98f2a63124d3a81fe64977693ba9a1b8ea2b 100644 (file)
--- a/tests/data/test141
+++ b/tests/data/test141
@@ -22,10 +22,10 @@ NOBODY
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP download info with -I
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -I
 </command>
 </client>

diff --git a/tests/data/test1410 b/tests/data/test1410
index 65e52d4065285e94101a10d6a478de20d2a154e0..0a9f4878b0ae6e070b0aa71af434d7445f28a06a 100644 (file)
--- a/tests/data/test1410
+++ b/tests/data/test1410
@@ -13,10 +13,10 @@ FAILURE
 <server>
 none
 </server>
- <name>
+<name>
 Pass in negative number to --max-time
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER --max-time -4
 </command>
 </client>

diff --git a/tests/data/test1411 b/tests/data/test1411
index 47b36f2b91c9b19b807c32fd3b8f7b2ec3d44021..bd8a8dd6897adc9002c98e440c1ff1ffcc9438cd 100644 (file)
--- a/tests/data/test1411
+++ b/tests/data/test1411
@@ -32,10 +32,10 @@ http
 </server>
 
 # make sure there's no Expect: 100-continue when there's no file to send!
- <name>
+<name>
 HTTP with zero size file PUT
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/empty%TESTNUMBER
 </command>
 # create an empty file

diff --git a/tests/data/test1412 b/tests/data/test1412
index 41f614415040560220e245f2ee2461b1c347b771..e4720dcdccf9a6b143519d6e673688f0a0690f3e 100644 (file)
--- a/tests/data/test1412
+++ b/tests/data/test1412
@@ -90,10 +90,10 @@ http
 !SSPI
 crypto
 </features>
- <name>
+<name>
 HTTP GET with --anyauth with two URLs (picking Digest)
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001
 </command>
 </client>

diff --git a/tests/data/test1413 b/tests/data/test1413
index 920417baed0e844412aa2a663161c7f779ee9883..1ab4c1a818dc97246c1e27ac3cbeec54304209ec 100644 (file)
--- a/tests/data/test1413
+++ b/tests/data/test1413
@@ -45,10 +45,10 @@ body
 <server>
 http
 </server>
- <name>
+<name>
 HTTP redirect with fragment in new URL
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/this/%TESTNUMBER -L
 </command>
 </client>

diff --git a/tests/data/test1414 b/tests/data/test1414
index 33214b04f275a574b4d25e6c9b23fe1509d9db4e..4be9b54222a73aca4d099e55a05232a318970298 100644 (file)
--- a/tests/data/test1414
+++ b/tests/data/test1414
@@ -28,10 +28,10 @@ REPLY EPRT 502 no such command
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP PORT without SIZE or EPRT support
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P -
 </command>
 </client>

diff --git a/tests/data/test1416 b/tests/data/test1416
index f3c6ba590e5e577e6abdfaa14880721ce26542df..1af3b61f080301582732c46eceefdc5f2cee9264 100644 (file)
--- a/tests/data/test1416
+++ b/tests/data/test1416
@@ -33,10 +33,10 @@ cccccccccccccccccccccccccccccccc
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with chunked Transfer-Encoding overflowed chunked size
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1417 b/tests/data/test1417
index 4400cec0ceb004d3bd848889e0b5dd8af255284a..7c9be16b6e877d0f76d513db9add0fa9fe5daecc 100644 (file)
--- a/tests/data/test1417
+++ b/tests/data/test1417
@@ -45,10 +45,10 @@ chunky-trailer: header data
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with chunked encoding and chunked trailer without CRs
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1418 b/tests/data/test1418
index a089154740cfe9a0d0315c14288d797e9ca4bbb3..748040811c3abd2bf2e46fa406414a3f6254cd4d 100644 (file)
--- a/tests/data/test1418
+++ b/tests/data/test1418
@@ -83,10 +83,10 @@ http
 !SSPI
 crypto
 </features>
- <name>
+<name>
 HTTP with --anyauth and connection reuse
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth http://%HOSTIP:%HTTPPORT/%TESTNUMBER0003
 </command>
 </client>

diff --git a/tests/data/test1419 b/tests/data/test1419
index b16cc933d76187391c87aac8061e7cf56c6f8fb2..aada395f8a3c74161353ff0fcdd113e47e809e72 100644 (file)
--- a/tests/data/test1419
+++ b/tests/data/test1419
@@ -41,10 +41,10 @@ Feel free to get it
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with --anyauth (but no auth!) and connection reuse
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --anyauth http://%HOSTIP:%HTTPPORT/%TESTNUMBER0003
 </command>
 </client>

diff --git a/tests/data/test142 b/tests/data/test142
index f64dddb5967c37a5802c29f2cd7555d2cd4a241a..c4ad11a6d856c1bceb64ebc9ca26f7c017248ddd 100644 (file)
--- a/tests/data/test142
+++ b/tests/data/test142
@@ -16,10 +16,10 @@ many parts there are
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP URL with 150 dir levels
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/part1/part2/part3/part4/part5/part6/part7/part8/part9/part10/part11/part12/part13/part14/part15/part16/part17/part18/part19/part20/part21/part22/part23/part24/part25/part26/part27/part28/part29/part30/part31/part32/part33/part34/part35/part36/part37/part38/part39/part40/part41/part42/part43/part44/part45/part46/part47/part48/part49/part50/part51/part52/part53/part54/part55/part56/part57/part58/part59/part60/part61/part62/part63/part64/part65/part66/part67/part68/part69/part70/part71/part72/part73/part74/part75/part76/part77/part78/part79/part80/part81/part82/part83/part84/part85/part86/part87/part88/part89/part90/part91/part92/part93/part94/part95/part96/part97/part98/part99/part100/part101/part102/part103/part104/part105/part106/part107/part108/part109/part110/part111/part112/part113/part114/part115/part116/part117/part118/part119/part120/part121/part122/part123/part124/part125/part126/part127/part128/part129/part130/part131/part132/part133/part134/part135/part136/part137/part138/part139/part140/part141/part142/part143/part144/part145/part146/part147/part148/part149/part150/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1420 b/tests/data/test1420
index e6f899f41722b52b23c52675e6586d687a70a977..1cb3b6ffe2069a64316a6b446107c53eb643379e 100644 (file)
--- a/tests/data/test1420
+++ b/tests/data/test1420
@@ -29,9 +29,9 @@ body
 <server>
 imap
 </server>
- <name>
+<name>
 --libcurl for IMAP FETCH message
- </name>
+</name>
 <setenv>
 SSL_CERT_FILE=
 </setenv>

diff --git a/tests/data/test1421 b/tests/data/test1421
index ec497ab6422d60d44e945c05616fef56b8019c2f..d62adfb046111e4e82a07ae1159fa5b9e5c25283 100644 (file)
--- a/tests/data/test1421
+++ b/tests/data/test1421
@@ -29,10 +29,10 @@ connection-monitor
 <server>
 http
 </server>
- <name>
+<name>
 Re-using HTTP proxy connection for two different host names
- </name>
- <command>
+</name>
+<command>
 --proxy http://%HOSTIP:%HTTPPORT http://test.remote.haxx.se.%TESTNUMBER:8990/ http://different.remote.haxx.se.%TESTNUMBER:8990
 </command>
 <features>

diff --git a/tests/data/test1425 b/tests/data/test1425
index 2bd6d84379aab247fb674921723e47f8488924fc..f51483dd0ce1a59e233e8e3e34c60c7a3cb95aab 100644 (file)
Binary files a/tests/data/test1425 and b/tests/data/test1425 differ

diff --git a/tests/data/test1426 b/tests/data/test1426
index 9ed994a56afc1e0e033f9d796f0ed219c7e8e875..d53138afaafd42a5cda44f4c6b94313db2f73cd3 100644 (file)
Binary files a/tests/data/test1426 and b/tests/data/test1426 differ

diff --git a/tests/data/test1427 b/tests/data/test1427
index adce46a84c089bab0321571d30a19ec8aba64fd7..ce5cbd15a6f0c6502df99d4ea5e88e49385a3379 100644 (file)
--- a/tests/data/test1427
+++ b/tests/data/test1427
@@ -11,10 +11,10 @@ integer overflow
 <server>
 none
 </server>
- <name>
+<name>
 too large -m timeout value
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER -m 184467440737095510
 </command>
 </client>

diff --git a/tests/data/test1428 b/tests/data/test1428
index ac91fd2f5629bfb404dec715b15f1eab969e94a6..9e7164454a76530312c41b265358d4882a7a4db4 100644 (file)
--- a/tests/data/test1428
+++ b/tests/data/test1428
@@ -46,10 +46,10 @@ contents
 http
 http-proxy
 </server>
- <name>
+<name>
 HTTP over proxy-tunnel with --proxy-header and --header
- </name>
- <command>
+</name>
+<command>
 http://test.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER -p -x %HOSTIP:%PROXYPORT --user 'iam:my:;self' --header "header-type: server" --proxy-header "header-type: proxy"
 </command>
 <features>

diff --git a/tests/data/test1429 b/tests/data/test1429
index 2f9dfb931120075ada1d7ea1f95c5c6df23f21ba..3d8dce1a9571409d96d90927e9cc071bd4d77e75 100644 (file)
--- a/tests/data/test1429
+++ b/tests/data/test1429
@@ -33,8 +33,8 @@ http
 
 <name>
 HTTP GET with 999 response code
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --write-out '%{response_code}'
 </command>
 </client>

diff --git a/tests/data/test143 b/tests/data/test143
index be5b33571d059a8418ecd503528a6c5168d6fb49..ed89e70dec7137372a9a0c7af5be07ba84499fc4 100644 (file)
--- a/tests/data/test143
+++ b/tests/data/test143
@@ -18,10 +18,10 @@ bla bla bla
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP URL with type=a
- </name>
- <command>
+</name>
+<command>
 "ftp://%HOSTIP:%FTPPORT/%2ftmp/moo/%TESTNUMBER;type=a"
 </command>
 </client>

diff --git a/tests/data/test1430 b/tests/data/test1430
index 8ed513c6069e0b63a8a4d93f83a04481b1c3004c..11db3ccbfcfa1ab3d116ad6ab7490cfd7b78e5cd 100644 (file)
--- a/tests/data/test1430
+++ b/tests/data/test1430
@@ -29,10 +29,10 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with negative response code
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1431 b/tests/data/test1431
index 26cf4aaf794db91d09447d0a3350be3dde4a35b1..3f396a4a2185b5848ea00661041455c0e68d88d3 100644 (file)
--- a/tests/data/test1431
+++ b/tests/data/test1431
@@ -29,10 +29,10 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with single-digit response code
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1432 b/tests/data/test1432
index d134688a31405709ac4f26ace8580727162732d2..4789057a1b4085602372733b6360190eb5fa3242 100644 (file)
--- a/tests/data/test1432
+++ b/tests/data/test1432
@@ -32,8 +32,8 @@ http
 
 <name>
 HTTP GET with 100-digit response code and survive
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1433 b/tests/data/test1433
index ac5081635871536d7f05d2aba03687d7361d35cd..aec6181a1eb31accef56825ea35775bcfbcace26 100644 (file)
--- a/tests/data/test1433
+++ b/tests/data/test1433
@@ -32,8 +32,8 @@ http
 
 <name>
 HTTP GET with 100-digit subversion number in response
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1434 b/tests/data/test1434
index 75baba7e8263b992983c5afd784a6bb14828453e..b6f775e0f603bb838be4ee60eaec647ac18c913f 100644 (file)
--- a/tests/data/test1434
+++ b/tests/data/test1434
@@ -54,10 +54,10 @@ Content-Type: text/plain
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET resume at exactly the existing file size is fine
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 100
 </command>
 <file name="%LOGDIR/curl%TESTNUMBER.out">

diff --git a/tests/data/test1435 b/tests/data/test1435
index 5e91f0289271640cebc741591a30ff797e4a7475..0e1e34f559a91b9d42d882e80a52f3cd496e49cc 100644 (file)
--- a/tests/data/test1435
+++ b/tests/data/test1435
@@ -24,10 +24,10 @@ unix-sockets
 <server>
 http-unix
 </server>
- <name>
+<name>
 simple HTTP GET over Unix socket
- </name>
- <command>
+</name>
+<command>
 --unix-socket %HTTPUNIXPATH http://server-interpreted.example.com/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1436 b/tests/data/test1436
index 38190f4a8573cdeef97b052c38793a82d837262b..352ef34e0bd9bb4832916206d655b5e27ce7265c 100644 (file)
--- a/tests/data/test1436
+++ b/tests/data/test1436
@@ -38,10 +38,10 @@ unix-sockets
 <server>
 http-unix
 </server>
- <name>
+<name>
 HTTP requests with multiple connections over Unix socket
- </name>
- <command>
+</name>
+<command>
 --unix-socket %HTTPUNIXPATH http://one.example.com/%TESTNUMBER0001 http://two.example.com/%TESTNUMBER0002 http://one.example.com/%TESTNUMBER0003
 </command>
 </client>

diff --git a/tests/data/test1437 b/tests/data/test1437
index 87a36d56518f484213d568a2e858181594b1ebed..29e800a43ddb316e6939549cc532300ba683fe68 100644 (file)
--- a/tests/data/test1437
+++ b/tests/data/test1437
@@ -55,10 +55,10 @@ http
 !SSPI
 crypto
 </features>
- <name>
+<name>
 HTTP with duplicated WWW-Authenticate parameters
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
 </command>
 </client>

diff --git a/tests/data/test144 b/tests/data/test144
index 4419b09f5292089ccc631ee79c90a771d9ad3581..be2ca5c8c5a0414a5b89029fa901617db259b8fb 100644 (file)
--- a/tests/data/test144
+++ b/tests/data/test144
@@ -21,10 +21,10 @@ REPLY NLST 450 No files found
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP NLST dir list without contents, using PORT
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/ -P - -l
 </command>
 </client>

diff --git a/tests/data/test1444 b/tests/data/test1444
index 7d79fbbab226c6f97567abd671d116150513f1c1..61b3a29f4c1caa2636b92299992f0abac9fd6f74 100644 (file)
--- a/tests/data/test1444
+++ b/tests/data/test1444
@@ -22,10 +22,10 @@ file data
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP with --remote-time
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --remote-time
 </command>
 # Verify the mtime of the file. The mtime is specifically chosen to be an even

diff --git a/tests/data/test1445 b/tests/data/test1445
index 7fb1d1df6cd96e0b0303ae385945d17cb89b695f..fee8932f14b916ac64454d3c63f59a905d2d7292 100644 (file)
--- a/tests/data/test1445
+++ b/tests/data/test1445
@@ -17,10 +17,10 @@ file
 <precheck>
 perl %SRCDIR/libtest/test613.pl prepare %PWD/%LOGDIR/test%TESTNUMBER.dir
 </precheck>
- <name>
+<name>
 file:// with --remote-time
- </name>
- <command>
+</name>
+<command>
 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.dir/plainfile.txt --remote-time
 </command>
 <postcheck>

diff --git a/tests/data/test1446 b/tests/data/test1446
index 5e11f11b078cb34204c71b30a4b2bbb385a4f4f9..f633ac17adb8468fca0c072347ca33af10294fc6 100644 (file)
--- a/tests/data/test1446
+++ b/tests/data/test1446
@@ -20,10 +20,10 @@ sftp
 <precheck>
 perl %SRCDIR/libtest/test613.pl prepare %PWD/%LOGDIR/test%TESTNUMBER.dir
 </precheck>
- <name>
+<name>
 SFTP with --remote-time
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.dir/rofile.txt --insecure --remote-time
 </command>
 <postcheck>

diff --git a/tests/data/test1447 b/tests/data/test1447
index 2a22e558bdc580311f141c6d09990fe9333bd324..0b0e4e65c3031d16418d63ba39425499394fca71 100644 (file)
--- a/tests/data/test1447
+++ b/tests/data/test1447
@@ -20,10 +20,10 @@ none
 http
 proxy
 </features>
- <name>
+<name>
 Provide illegal proxy name
- </name>
- <command>
+</name>
+<command>
 --proxy "http://a:b@/x" http://%HOSTIP:%NOLISTENPORT
 </command>
 </client>

diff --git a/tests/data/test1448 b/tests/data/test1448
index 600f724156226b925b6e32def54474e03221bcf3..6a9ba5212a46818a823369fd745b8e3c2c95b51a 100644 (file)
--- a/tests/data/test1448
+++ b/tests/data/test1448
@@ -48,11 +48,11 @@ LC_CTYPE=en_US.UTF-8
 <precheck>
 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
 </precheck>
- <name>
+<name>
 Redirect following to UTF-8 IDN host name
- </name>
+</name>
 
- <command>
+<command>
 http://åäö.se:%HTTPPORT/%TESTNUMBER --resolve xn--4cab6c.se:%HTTPPORT:%HOSTIP -L --connect-to %HOSTIP:%HTTPPORT:%HOSTIP:%HTTPPORT
 </command>
 </client>

diff --git a/tests/data/test1449 b/tests/data/test1449
index ba24ef91227f8a5479d8dcdb05d8b3ff2dca8f05..0b9de0192c8540d9ac0b349f7623deedc1ca4f6a 100644 (file)
--- a/tests/data/test1449
+++ b/tests/data/test1449
@@ -17,10 +17,10 @@ Resume
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP download range with integer overflow
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -r 36893488147419103232-
 </command>
 </client>

diff --git a/tests/data/test145 b/tests/data/test145
index 1e80cf8ce8b5c849ee889abeafca953e319c6441..53f3f631d7bf7c433d2f94a61db8e727a8e6e621 100644 (file)
--- a/tests/data/test145
+++ b/tests/data/test145
@@ -20,10 +20,10 @@ REPLY NLST 550 Have a taste on this!
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP NLST dir list with weird reply code, using PORT
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/ -P - -l
 </command>
 </client>

diff --git a/tests/data/test1450 b/tests/data/test1450
index ca3ac8849a4d3b59c250f3d800943e9b21c6825e..5d7e568bc259418cfc609aa00858d0902330f55f 100644 (file)
--- a/tests/data/test1450
+++ b/tests/data/test1450
@@ -19,10 +19,10 @@ dict
 <features>
 dict
 </features>
- <name>
+<name>
 Basic DICT lookup
- </name>
- <command>
+</name>
+<command>
 dict://%HOSTIP:%DICTPORT/d:basic
 </command>
 </client>

diff --git a/tests/data/test1452 b/tests/data/test1452
index d1b7fa9cdd9bf12170e4acec53f8b91d598f7f8e..6763265b7db86ad94247a876999e75b4b167724c 100644 (file)
--- a/tests/data/test1452
+++ b/tests/data/test1452
@@ -22,13 +22,13 @@ telnet
 <features>
 telnet
 </features>
- <name>
+<name>
 Basic TELNET negotiation
- </name>
+</name>
 <stdin>
 test%TESTNUMBER
 </stdin>
- <command>
+<command>
 telnet://%HOSTIP:%TELNETPORT --upload-file -
 </command>
 </client>

diff --git a/tests/data/test1453 b/tests/data/test1453
index 76b5acda4ff547743c595fc1d6232413a33e3627..aa0878efa908545824a6083fd5fddbd6784b5fdf 100644 (file)
--- a/tests/data/test1453
+++ b/tests/data/test1453
@@ -19,10 +19,10 @@ none
 <features>
 tftp
 </features>
- <name>
+<name>
 Too long tftp filename
- </name>
- <command>
+</name>
+<command>
 tftp://%HOSTIP:%NOLISTENPORT/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaz
 </command>
 </client>

diff --git a/tests/data/test1454 b/tests/data/test1454
index 36e28e49abe40785f0e5b0d05cf80da1d788a7cc..4908a178db045eb0ba5d0a932246abe674accb33 100644 (file)
--- a/tests/data/test1454
+++ b/tests/data/test1454
@@ -19,9 +19,9 @@
 <server>
 http
 </server>
- <name>
+<name>
 --connect-to with IPv6 address w/o IPv6 support!
- </name>
+</name>
 <command>
 --connect-to localhost:80:[::1]:80 localhost
 </command>

diff --git a/tests/data/test1456 b/tests/data/test1456
index 4aca9ca4e6f544b383fc222f8dbc04187494fea5..3f3a74783dc3d4388e9c90de460a793f9fc6760b 100644 (file)
--- a/tests/data/test1456
+++ b/tests/data/test1456
@@ -36,10 +36,10 @@ ipv6
 <server>
 http-ipv6
 </server>
- <name>
+<name>
 HTTP-IPv6 GET with PROXY protocol
- </name>
- <command>
+</name>
+<command>
 -g "http://%HOST6IP:%HTTP6PORT/%TESTNUMBER" --haproxy-protocol
 </command>
 <features>

diff --git a/tests/data/test1459 b/tests/data/test1459
index 2a69a60330e500849fd8dafb49aae32d5dfc7cb5..c05da3cb585e9ccb52d8daaf86a949259473ad41 100644 (file)
--- a/tests/data/test1459
+++ b/tests/data/test1459
@@ -19,10 +19,10 @@ mkdir -p %PWD/%LOGDIR/test%TESTNUMBER.dir/.ssh
 sftp
 !oldlibssh
 </features>
- <name>
+<name>
 SFTP with corrupted known_hosts
- </name>
- <command>
+</name>
+<command>
 -u : sftp://%HOSTIP:%SSHPORT/ -l
 </command>
 <file name="%LOGDIR/test%TESTNUMBER.dir/.ssh/known_hosts">

diff --git a/tests/data/test146 b/tests/data/test146
index f9f01174fb954f2bfcd5e730a8359eb2c2d45015..803fbfc4d70b6bef414dc1bfbae3db3bdfcc4084 100644 (file)
--- a/tests/data/test146
+++ b/tests/data/test146
@@ -19,10 +19,10 @@ this is file contents
 <server>
 ftp
 </server>
- <name>
+<name>
 persistent FTP with different paths
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/first/dir/here/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1461 b/tests/data/test1461
index 65797a405a2bc39753a5346585efeb1deb8cd530..e25e29f39e6ad9e92cc3c6a2d78d9bcb3daaa23d 100644 (file)
--- a/tests/data/test1461
+++ b/tests/data/test1461
@@ -16,10 +16,10 @@
 <server>
 none
 </server>
- <name>
+<name>
 curl important --help
- </name>
- <command>
+</name>
+<command>
 --help
 </command>
 </client>

diff --git a/tests/data/test1462 b/tests/data/test1462
index ce99029465e778da0e2dbde87fdd92f15d9a9547..654e443444b65a74a265b2731060b947687e20f9 100644 (file)
--- a/tests/data/test1462
+++ b/tests/data/test1462
@@ -16,10 +16,10 @@
 <server>
 none
 </server>
- <name>
+<name>
 curl invalid category --help
- </name>
- <command>
+</name>
+<command>
 --help sdfafdsfadsfsd
 </command>
 </client>

diff --git a/tests/data/test1463 b/tests/data/test1463
index 3904324c7e5653c9dfa0e474cf4a28d4a356b15d..c59ac552b81c1dad4ac8b3051d854d2862f31b3d 100644 (file)
--- a/tests/data/test1463
+++ b/tests/data/test1463
@@ -20,10 +20,10 @@ none
 <features>
 file
 </features>
- <name>
+<name>
 curl file category --help
- </name>
- <command>
+</name>
+<command>
 --help file
 </command>
 </client>

diff --git a/tests/data/test1464 b/tests/data/test1464
index 44a7adcf0bf539340760de4a242ebd465f9110ac..091933df2d462d5be322d42b98265cd04357d27f 100644 (file)
--- a/tests/data/test1464
+++ b/tests/data/test1464
@@ -20,10 +20,10 @@ none
 <features>
 file
 </features>
- <name>
+<name>
 curl file category --help with lower/upper mix
- </name>
- <command>
+</name>
+<command>
 --help fIlE
 </command>
 </client>

diff --git a/tests/data/test1465 b/tests/data/test1465
index 341237d24ef6d41ac92e3a8ab4e8557a6c4f9751..380943d9267c3ac1cc6878513455950076763dd6 100644 (file)
--- a/tests/data/test1465
+++ b/tests/data/test1465
@@ -25,13 +25,13 @@ Connection: close
 <server>
 http
 </server>
- <name>
+<name>
 --libcurl for POST with binary content
- </name>
+</name>
 <setenv>
 SSL_CERT_FILE=
 </setenv>
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl %LOGDIR/test%TESTNUMBER.c --data-binary @%LOGDIR/%TESTNUMBER-upload
 </command>
 # "ab\x81""cd\0e\\\"?\r\n\t\x01""fghi%x1Ajklm%xFD"

diff --git a/tests/data/test1466 b/tests/data/test1466
index 0955d660c2cc801d59d6741637199cb3fa7feede..315974ad413bc3d4ea64f5bc5701e2805f99412e 100644 (file)
--- a/tests/data/test1466
+++ b/tests/data/test1466
@@ -25,8 +25,8 @@ http
 
 <name>
 HTTP GET with 3-digit response and only digits in reason
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1467 b/tests/data/test1467
index 4e1d68fecf0114ed822635ba83aa031148aa7d50..bf6ed8f389a91d582d10a42d9697824a1034bfe7 100644 (file)
--- a/tests/data/test1467
+++ b/tests/data/test1467
@@ -38,10 +38,10 @@ unix-sockets
 http
 socks5unix
 </server>
- <name>
+<name>
 HTTP GET via SOCKS5 proxy via unix sockets
- </name>
- <command>
+</name>
+<command>
 --socks5 localhost%SOCKSUNIXPATH http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1468 b/tests/data/test1468
index b4030babd8394e7aec570ce96df4d6589d8804e5..dad25df125cb28cc3db0ed9567a659c6b7cfbad1 100644 (file)
--- a/tests/data/test1468
+++ b/tests/data/test1468
@@ -39,10 +39,10 @@ unix-sockets
 http
 socks5unix
 </server>
- <name>
+<name>
 HTTP GET with host name using SOCKS5h via unix sockets
- </name>
- <command>
+</name>
+<command>
 http://this.is.a.host.name:%HTTPPORT/%TESTNUMBER --proxy socks5h://localhost%SOCKSUNIXPATH
 </command>
 </client>

diff --git a/tests/data/test1469 b/tests/data/test1469
index f2b3882cb2c0bcff175ba86068a3fe19357f4190..1aa512e50fbf288c499c36cdbee619ac00c7b39f 100644 (file)
--- a/tests/data/test1469
+++ b/tests/data/test1469
@@ -12,10 +12,10 @@ FAILURE
 <server>
 none
 </server>
- <name>
+<name>
 Space in FTP upload URL
- </name>
- <command>
+</name>
+<command>
 "ftp://%HOSTIP:%NOLISTENPORT/%TESTNUMBER%/with space/" -T %LOGDIR/irrelevant-file
 </command>
 </client>

diff --git a/tests/data/test147 b/tests/data/test147
index 066118648259453f79bc26a52f5594a8772c7c50..769043d489047287165b5b66abeb2a8c94d24d21 100644 (file)
--- a/tests/data/test147
+++ b/tests/data/test147
@@ -21,10 +21,10 @@ COUNT CWD 1
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP with --ftp-create-dirs (failing CWD)
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/first/dir/here/%TESTNUMBER --ftp-create-dirs
 </command>
 </client>

diff --git a/tests/data/test1470 b/tests/data/test1470
index 30f539d4bcbab60476c7dcfcd673ab3a27b3efd4..ad4fb711af092a7b49d9e1f2d369e1377e8ed612 100644 (file)
--- a/tests/data/test1470
+++ b/tests/data/test1470
@@ -40,10 +40,10 @@ unix-sockets
 https
 socks5unix
 </server>
- <name>
+<name>
 HTTPS GET with host name using SOCKS5h via unix sockets
- </name>
- <command>
+</name>
+<command>
 https://this.is.a.host.name:%HTTPSPORT/%TESTNUMBER -k --proxy socks5h://localhost%SOCKSUNIXPATH
 </command>
 </client>

diff --git a/tests/data/test1473 b/tests/data/test1473
index a437730ef4d768095ce794d2c09c4ff7e131dd9e..5e4d18348b900df36d30379c0ee2988ac03fddb8 100644 (file)
--- a/tests/data/test1473
+++ b/tests/data/test1473
@@ -28,10 +28,10 @@ Content-Length: 6
 <server>
 http
 </server>
- <name>
+<name>
 first HTTP header starts with white space
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1474 b/tests/data/test1474
index c27ed7da2a47481a08a300c2dd0c22bcff36f653..a87044d1a63a52b61070489e25ee65679b0ba6a3 100644 (file)
--- a/tests/data/test1474
+++ b/tests/data/test1474
@@ -82,10 +82,10 @@ connection-monitor
 <server>
 http
 </server>
- <name>
+<name>
 HTTP PUT with Expect: 100-continue and 417 response during upload
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt --limit-rate 64K --expect100-timeout 0.001
 </command>
 <precheck>

diff --git a/tests/data/test148 b/tests/data/test148
index 8e9f842d8e65d01979b54e6a89afd8ffca9dfb9b..051d31a9deac2b9d2ba1db29520e55d638ef36df 100644 (file)
--- a/tests/data/test148
+++ b/tests/data/test148
@@ -18,10 +18,10 @@ REPLY MKD 550 We will have no such thing
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP with --ftp-create-dirs (failing MKD)
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/attempt/to/get/this/%TESTNUMBER --ftp-create-dirs
 </command>
 </client>

diff --git a/tests/data/test149 b/tests/data/test149
index e01c3f12801966be0c557c8ecf5086d04ebf097e..404922b296c46499d432839ce9326bce675cb461 100644 (file)
--- a/tests/data/test149
+++ b/tests/data/test149
@@ -14,10 +14,10 @@ FTP
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP with multiple uploads
- </name>
- <command>
+</name>
+<command>
 -T %LOGDIR/upload%TESTNUMBER ftp://%HOSTIP:%FTPPORT/dir1/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER ftp://%HOSTIP:%FTPPORT/dir2/%TESTNUMBER
 </command>
 <file name="%LOGDIR/upload%TESTNUMBER">

diff --git a/tests/data/test15 b/tests/data/test15
index ad7c06cb3621ccb4421d4ccce3f8f2d8921ab5c3..ba24d2e0b2c1697989181a3af37697a55fbeca9b 100644 (file)
--- a/tests/data/test15
+++ b/tests/data/test15
@@ -24,10 +24,10 @@ Repeated nonsense-headers
 <server>
 http
 </server>
- <name>
+<name>
 --write-out test
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER --write-out "%{url_effective} %{http_code} %{size_download}\n"
 </command>
 </client>

diff --git a/tests/data/test1500 b/tests/data/test1500
index 241f227f99dfc99063fc1f7615ee10d6c1717f29..0454f8ecbee4412bf0211f198fd47cd59ddc5965 100644 (file)
--- a/tests/data/test1500
+++ b/tests/data/test1500
@@ -34,10 +34,10 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 curl_multi_wait
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1501 b/tests/data/test1501
index 68b55896dac349709eb2561c3eb809e2e02fec0a..195c17998cd3bfa611c285510bd00eb4e53ed5fb 100644 (file)
--- a/tests/data/test1501
+++ b/tests/data/test1501
@@ -30,10 +30,10 @@ lib%TESTNUMBER
 <killserver>
 ftp
 </killserver>
- <name>
+<name>
 FTP with multi interface and slow LIST response
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/
 </command>
 </client>

diff --git a/tests/data/test1502 b/tests/data/test1502
index 859a98fc803f68c5fbc94fdbf5fa36a9cc77f3e6..e2639f404af0c796eacbe036988fe6ceaa18eace 100644 (file)
--- a/tests/data/test1502
+++ b/tests/data/test1502
@@ -34,10 +34,10 @@ http
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 HTTP multi with CURLOPT_RESOLVE, cleanup sequence UA
- </name>
- <command>
+</name>
+<command>
 http://google.com:%HTTPPORT/%TESTNUMBER %HTTPPORT %HOSTIP
 </command>
 </client>

diff --git a/tests/data/test1503 b/tests/data/test1503
index a093ac3bba52c0aba4efa233f9e390ff246ba1a1..9c746c74e809b4766bbd59eaa7db460eb39bedbe 100644 (file)
--- a/tests/data/test1503
+++ b/tests/data/test1503
@@ -34,10 +34,10 @@ http
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 HTTP multi with CURLOPT_RESOLVE, cleanup sequence PA
- </name>
- <command>
+</name>
+<command>
 http://google.com:%HTTPPORT/%TESTNUMBER %HTTPPORT %HOSTIP
 </command>
 </client>

diff --git a/tests/data/test1504 b/tests/data/test1504
index 8dc4f1856a24f8c8445c314fbb44bfab540a2ce7..663e25e274e70a1678291acddbe85616fdcc7a1e 100644 (file)
--- a/tests/data/test1504
+++ b/tests/data/test1504
@@ -34,10 +34,10 @@ http
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 HTTP multi with CURLOPT_RESOLVE, cleanup sequence UB
- </name>
- <command>
+</name>
+<command>
 http://google.com:%HTTPPORT/%TESTNUMBER %HTTPPORT %HOSTIP
 </command>
 </client>

diff --git a/tests/data/test1505 b/tests/data/test1505
index 9ddac46b8ea22a8feb77b48df8a50bbc50851a64..666e4d984bb00e283aaa7e98f31434619cad6057 100644 (file)
--- a/tests/data/test1505
+++ b/tests/data/test1505
@@ -34,10 +34,10 @@ http
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 HTTP multi with CURLOPT_RESOLVE, cleanup sequence PB
- </name>
- <command>
+</name>
+<command>
 http://google.com:%HTTPPORT/%TESTNUMBER %HTTPPORT %HOSTIP
 </command>
 </client>

diff --git a/tests/data/test1506 b/tests/data/test1506
index aee53a9225970178bd448aa2bbfd60969ae95762..9eb38cf6d115d409946745b096fb8873c1524827 100644 (file)
--- a/tests/data/test1506
+++ b/tests/data/test1506
@@ -51,10 +51,10 @@ http
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 HTTP GET connection cache limit (CURLMOPT_MAXCONNECTS)
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/path/%TESTNUMBER %HOSTIP %HTTPPORT
 </command>
 </client>

diff --git a/tests/data/test1507 b/tests/data/test1507
index 8208752adf1ae95fadf6e4f449562e17c5e16e74..e1eb12bc3682fad448fc4a3c36663cbc46a74315 100644 (file)
--- a/tests/data/test1507
+++ b/tests/data/test1507
@@ -22,16 +22,16 @@ lib%TESTNUMBER
 </tool>
 
 # based on bug report #1184
- <name>
+<name>
 SMTP with multi interface and CURLE_ABORTED_BY_CALLBACK
- </name>
+</name>
 <stdin>
 From: different
 To: another
 
 body
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1508 b/tests/data/test1508
index 78ff18fb3df7eeab0093135c32139952981c029f..9b210ec0f3a7acea9c5223a7e589cbf587ddb5e5 100644 (file)
--- a/tests/data/test1508
+++ b/tests/data/test1508
@@ -14,10 +14,10 @@ none
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 Close a multi handle without using it
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%NOLISTENPORT/path/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1509 b/tests/data/test1509
index 7c427bf7fdfd70cf356b970e0d022ff5826ca03f..d7a7519c0820e0a871b18401bfae382d885fb52c 100644 (file)
--- a/tests/data/test1509
+++ b/tests/data/test1509
@@ -56,10 +56,10 @@ lib%TESTNUMBER
 <features>
 proxy
 </features>
- <name>
+<name>
 simple multi http:// through proxytunnel with authentication info
- </name>
- <command>
+</name>
+<command>
 http://the.old.moo.%TESTNUMBER:%HTTPPORT/%TESTNUMBER %HOSTIP:%PROXYPORT
 </command>
 <file name="%LOGDIR/test%TESTNUMBER.txt">

diff --git a/tests/data/test151 b/tests/data/test151
index d05c7a00056d7a93dd46305d2aaba3a605a5aaea..98035f8b47623737c308415559a4089ed0396d6f 100644 (file)
--- a/tests/data/test151
+++ b/tests/data/test151
@@ -24,10 +24,10 @@ authentication so we should still fail.
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with an error code that might trick authentication
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1510 b/tests/data/test1510
index eccbb6c94295203b2d7793347efced5eaa7354db..41a5b29c3f1a3db4c4d8545ca0299cecb47b488c 100644 (file)
--- a/tests/data/test1510
+++ b/tests/data/test1510
@@ -51,10 +51,10 @@ http
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 HTTP GET connection cache limit (CURLOPT_MAXCONNECTS)
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/path/%TESTNUMBER %HOSTIP %HTTPPORT
 </command>
 </client>

diff --git a/tests/data/test1512 b/tests/data/test1512
index 7c04660fe5da81731d2fd7f904a39d1c7c91fad8..c3a532c96b3bd418e173e33a094b346667bdd5a2 100644 (file)
--- a/tests/data/test1512
+++ b/tests/data/test1512
@@ -50,10 +50,10 @@ http
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 GLOBAL CACHE test over two easy performs
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/path/%TESTNUMBER %HOSTIP %HTTPPORT
 </command>
 </client>

diff --git a/tests/data/test1513 b/tests/data/test1513
index a32d2eb5c1ab4569d3cac0915ff43a9c8071639a..90c32229f75e8876ffaf5b3b11a84b0fbce98fb3 100644 (file)
--- a/tests/data/test1513
+++ b/tests/data/test1513
@@ -25,12 +25,12 @@ http
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 return failure immediately from progress callback
- </name>
+</name>
 
 # this server/host won't be used for real
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1517 b/tests/data/test1517
index 539dd6208f8b790c3ef049d1d9a4ea8168d51231..c9b5e2e8c4a4528623cff4a04133a2a1f39afea2 100644 (file)
--- a/tests/data/test1517
+++ b/tests/data/test1517
@@ -49,10 +49,10 @@ lib%TESTNUMBER
 ./libtest/lib%TESTNUMBER check
 </precheck>
 
- <name>
+<name>
 HTTP POST, server responds before completed send
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1518 b/tests/data/test1518
index 9b3f6be6051ce4a1c5c6470608604c91f8f2a991..ea5304d1b6ad621fada38f4a474e0751d75519ef 100644 (file)
--- a/tests/data/test1518
+++ b/tests/data/test1518
@@ -32,10 +32,10 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 Extract Location: with broken URL
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1519 b/tests/data/test1519
index 2eadb17060134f8fb9727dc9a23f0ca4a77f5c2d..f57f68544a43809eedf4a52edb52a3582657b2fb 100644 (file)
--- a/tests/data/test1519
+++ b/tests/data/test1519
@@ -32,10 +32,10 @@ http
 lib1518
 </tool>
 
- <name>
+<name>
 Extract Location: with broken absolute URL
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test152 b/tests/data/test152
index a558ed596b7f45680283ba458a6c1dc1bacdeb96..31c2360192b817cbe4527988f270bd0bcf510e1e 100644 (file)
--- a/tests/data/test152
+++ b/tests/data/test152
@@ -25,10 +25,10 @@ authentication so we should still fail.
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with an error code that might trick authentication and --fail
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --fail
 </command>
 </client>

diff --git a/tests/data/test1520 b/tests/data/test1520
index fc031ad00133d9ee4198d9bb863bf0f9cc24bcde..c360cabc75f3e69ffd7a08f3918b5869e99568cc 100644 (file)
--- a/tests/data/test1520
+++ b/tests/data/test1520
@@ -16,9 +16,9 @@ smtp
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 SMTP with CRLF-dot-CRLF in data
- </name>
+</name>
 <stdin>
 From: different\r
 To: another\r
@@ -31,7 +31,7 @@ To: another
 \r
 body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1521 b/tests/data/test1521
index f086243e43718584d3097a485a2f5bc16162125a..21d51fdca7ff103119ab7b16e7ab7cca23c313a5 100644 (file)
--- a/tests/data/test1521
+++ b/tests/data/test1521
@@ -15,10 +15,10 @@ none
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 Test all curl_easy_setopt and curl_easy_getinfo options
- </name>
- <command>
+</name>
+<command>
 unused
 </command>
 </client>

diff --git a/tests/data/test1524 b/tests/data/test1524
index b5ac86610bd5f60b3cbcabd1f120cc2a7c560e23..8756ec630663e62854be9fada8882b3c97890f17 100644 (file)
--- a/tests/data/test1524
+++ b/tests/data/test1524
@@ -41,10 +41,10 @@ body
 <server>
 http
 </server>
- <name>
+<name>
 HTTP PUT with 303 redirect
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -T %LOGDIR/upload%TESTNUMBER.txt
 </command>
 <file name="%LOGDIR/upload%TESTNUMBER.txt">

diff --git a/tests/data/test1525 b/tests/data/test1525
index 33f71c877cb5a5d96391e63443066c750be8ed05..2778c3f564822ab52928cb52a1e767e1849d1502 100644 (file)
--- a/tests/data/test1525
+++ b/tests/data/test1525
@@ -45,10 +45,10 @@ http-proxy
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 CURLOPT_PROXYHEADER is ignored CURLHEADER_UNIFIED
- </name>
- <command>
+</name>
+<command>
  http://the.old.moo.%TESTNUMBER:%HTTPPORT/%TESTNUMBER %HOSTIP:%PROXYPORT
 </command>
 <features>

diff --git a/tests/data/test1526 b/tests/data/test1526
index 4076124054d47d74e334466bdf8f26fcdf3d3893..cd4a4f48b03223e0ec4bd4392e925faae8149b0f 100644 (file)
--- a/tests/data/test1526
+++ b/tests/data/test1526
@@ -47,10 +47,10 @@ http-proxy
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 CURLOPT_PROXYHEADER: separate host/proxy headers
- </name>
- <command>
+</name>
+<command>
  http://the.old.moo.%TESTNUMBER:%HTTPPORT/%TESTNUMBER %HOSTIP:%PROXYPORT
 </command>
 <features>

diff --git a/tests/data/test1527 b/tests/data/test1527
index 3f35cb841e509e80d2a2bf06ee036b48bcb11c2b..bf377d8262a3d8d82b1a4597dc8444ccd266d10b 100644 (file)
--- a/tests/data/test1527
+++ b/tests/data/test1527
@@ -46,10 +46,10 @@ http-proxy
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 Check same headers are generated with CURLOPT_HEADEROPT == CURLHEADER_UNIFIED
- </name>
- <command>
+</name>
+<command>
  http://the.old.moo.%TESTNUMBER:%HTTPPORT/%TESTNUMBER %HOSTIP:%PROXYPORT
 </command>
 <features>

diff --git a/tests/data/test1528 b/tests/data/test1528
index 8bd056656f6f195876de82f6c58713a9b24fec8f..8c0209ce8092d75075de3ce56e912c56a7561b06 100644 (file)
--- a/tests/data/test1528
+++ b/tests/data/test1528
@@ -37,10 +37,10 @@ http-proxy
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 Separately specified proxy/server headers sent in a proxy GET
- </name>
- <command>
+</name>
+<command>
  http://the.old.moo:%HTTPPORT/%TESTNUMBER %HOSTIP:%PROXYPORT
 </command>
 <features>

diff --git a/tests/data/test1529 b/tests/data/test1529
index 68136aae30fc572bb3acafb48bf89290be8edb43..a06ce75db9495eeed16a0cdb420af9c0d0569eeb 100644 (file)
--- a/tests/data/test1529
+++ b/tests/data/test1529
@@ -25,10 +25,10 @@ http-proxy
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 HTTP request-injection in URL sent over proxy
- </name>
- <command>
+</name>
+<command>
  "http://the.old.moo:%HTTPPORT/%TESTNUMBER" %HOSTIP:%PROXYPORT
 </command>
 <features>

diff --git a/tests/data/test153 b/tests/data/test153
index c51824fe7b7c64934a9178b674d98463552fbbb6..b55a70a03897bda57a67e2dfc0e72feb0c147bcb 100644 (file)
--- a/tests/data/test153
+++ b/tests/data/test153
@@ -77,10 +77,10 @@ http
 !SSPI
 crypto
 </features>
- <name>
+<name>
 HTTP with Digest authorization with stale=true
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -u testuser:testpass --digest http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002
 </command>
 </client>

diff --git a/tests/data/test1530 b/tests/data/test1530
index 0fbd21cf07dcd4697000fb0bec13b25601bebc13..2475c14175a3c7ec937e3a29712566c7d3217988 100644 (file)
--- a/tests/data/test1530
+++ b/tests/data/test1530
@@ -15,9 +15,9 @@ http
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 CURLOPT_OPENSOCKETFUNCTION returns bad socket
- </name>
+</name>
 </client>
 
 # it should be detected and an error should be reported

diff --git a/tests/data/test1531 b/tests/data/test1531
index e590af08ba33e1a4a9661dc24580d1043af5dfd4..00801bb9755e4b8ebd19a270a2b2c2e7ffd4229a 100644 (file)
Binary files a/tests/data/test1531 and b/tests/data/test1531 differ

diff --git a/tests/data/test154 b/tests/data/test154
index a05eb8aea5667061ffa3aeca844df923698b7df3..4f818f00f787d64196241e3570935b2d43f3427f 100644 (file)
--- a/tests/data/test154
+++ b/tests/data/test154
@@ -63,10 +63,10 @@ http
 !SSPI
 crypto
 </features>
- <name>
+<name>
 HTTP PUT with --anyauth authorization (picking Digest)
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/put%TESTNUMBER -u testuser:testpass --anyauth
 </command>
 <file name="%LOGDIR/put%TESTNUMBER">

diff --git a/tests/data/test1540 b/tests/data/test1540
index 0ef5101cede60e139166a390f4a860837f7ea16d..ad496449b7a92c53258c310b68fcd2e7d81d322f 100644 (file)
--- a/tests/data/test1540
+++ b/tests/data/test1540
@@ -47,10 +47,10 @@ http
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 chunked with trailers and pausing the receive
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1542 b/tests/data/test1542
index 7de153d77c9b4598fb43257b150158921d07b631..f9806cda81951244f23a6a35818277eb1ca2e359 100644 (file)
--- a/tests/data/test1542
+++ b/tests/data/test1542
@@ -26,10 +26,10 @@ http
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 connection reuse with CURLOPT_MAXLIFETIME_CONN
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1544 b/tests/data/test1544
index 861c4fbfccee66a02fb3189e13f8a8bca20c05de..f658f5a74937056f88e54302887a9e49bdcf5c64 100644 (file)
--- a/tests/data/test1544
+++ b/tests/data/test1544
@@ -12,9 +12,9 @@ source analysis
 none
 </server>
 
- <name>
+<name>
 Verify all string options are translated by OS/400 wrapper
- </name>
+</name>
 
 <command type="perl">
 %SRCDIR/check-translatable-options.pl %SRCDIR/..

diff --git a/tests/data/test1550 b/tests/data/test1550
index bfb80a1cab7a9f079718cd2aa3591b08f8eb7ccb..2d297a47af7790b4e056c3c2436716c4aaa8af1a 100644 (file)
--- a/tests/data/test1550
+++ b/tests/data/test1550
@@ -19,10 +19,10 @@ none
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 verify setting pipeling blocklisting options
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1551 b/tests/data/test1551
index 4c60db85dff7fde0569d780353276aeb40c7d8f7..8af8d6641e3980ceb7298853166f17077cbae408 100644 (file)
--- a/tests/data/test1551
+++ b/tests/data/test1551
@@ -38,10 +38,10 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 re-run redirected transfer without setting URL again
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1552 b/tests/data/test1552
index 9468f413385af8724e6a276a14a7571a68a04694..fd35ca1f61c62cbad12d03769bd778c0ea0db3e5 100644 (file)
--- a/tests/data/test1552
+++ b/tests/data/test1552
@@ -31,14 +31,14 @@ body
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP multi transfer error without curl_multi_remove_handle
- </name>
+</name>
 # tool is what to use instead of 'curl'
 <tool>
 lib%TESTNUMBER
 </tool>
- <command>
+<command>
 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1'
 </command>
 </client>

diff --git a/tests/data/test1553 b/tests/data/test1553
index 595eb5ba59b9ad279f7e0231ecee1bf2da4fd1be..0c01ab3e6960336a83d62cee4fffc14bd129a279 100644 (file)
--- a/tests/data/test1553
+++ b/tests/data/test1553
@@ -34,9 +34,9 @@ Mime
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP cleanup before a connection was created
- </name>
+</name>
 # tool is what to use instead of 'curl'
 <tool>
 lib%TESTNUMBER

diff --git a/tests/data/test1555 b/tests/data/test1555
index 6985630d4d9d50a4cf9e9b488565724d0264e193..e3c7e55c6921c5ba1d144ecb98cabf39fe3439b5 100644 (file)
--- a/tests/data/test1555
+++ b/tests/data/test1555
@@ -25,12 +25,12 @@ http
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 verify api is protected against calls from callbacks
- </name>
+</name>
 
 # this server/host won't be used for real
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1556 b/tests/data/test1556
index 08951a8d22473fe640ff1a3699742b4ce5933e59..80254da2d444c1d368303a195886ecd99becc541 100644 (file)
--- a/tests/data/test1556
+++ b/tests/data/test1556
@@ -35,10 +35,10 @@ http
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 send long HTTP headers to header callback
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test156 b/tests/data/test156
index 214b5396eed16f745bd9a75e0c3336bcfee52153..877c215b93911f976ed3bc027c34a16865bcfd8c 100644 (file)
--- a/tests/data/test156
+++ b/tests/data/test156
@@ -24,10 +24,10 @@ PUT received fine. Thank you very much
 <server>
 http
 </server>
- <name>
+<name>
 HTTP PUT with --anyauth (when the server requires none)
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/put%TESTNUMBER -u testuser:testpass --anyauth
 </command>
 <file name="%LOGDIR/put%TESTNUMBER">

diff --git a/tests/data/test1560 b/tests/data/test1560
index 5ed0adde89184ab72e87b54ca240f43ad1727591..fc27000d149465541d615d0c073677a46a92bec7 100644 (file)
--- a/tests/data/test1560
+++ b/tests/data/test1560
@@ -26,9 +26,9 @@ ldap
 dict
 ftp
 </features>
- <name>
+<name>
 URL API
- </name>
+</name>
 <tool>
 lib%TESTNUMBER
 </tool>

diff --git a/tests/data/test1567 b/tests/data/test1567
index 3e6ce8812badf50660315c1df1dd931514176ccd..68b1fe21102f6464e4b938b55b35e82129fbb42e 100644 (file)
--- a/tests/data/test1567
+++ b/tests/data/test1567
@@ -39,10 +39,10 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 re-run redirected transfer without setting CURLU URL again
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1569 b/tests/data/test1569
index 3342f84fc48084df81f5d38be01e75afbff519ca..159a813919ee272ab247d740200ddc32379d1098 100644 (file)
--- a/tests/data/test1569
+++ b/tests/data/test1569
@@ -26,9 +26,9 @@ REPLY EPSV 500 no such command
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP first type=A then regular URL
- </name>
+</name>
 <tool>
 lib%TESTNUMBER
 </tool>

diff --git a/tests/data/test157 b/tests/data/test157
index 63e611c783ad172bab19ca093d13bf1c0afdf574..5ab45ec05b391a9104879d025f5ffa9a976b0492 100644 (file)
--- a/tests/data/test157
+++ b/tests/data/test157
@@ -24,10 +24,10 @@ GET received and served just fine. Thank you very much
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with --anyauth (when the server requires none)
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth
 </command>
 </client>

diff --git a/tests/data/test1570 b/tests/data/test1570
index 40c87ef4041eba3cbfbf1e158b3022310395682c..713ab5ea778c591b7b6d907e835d50d62ef97460 100644 (file)
--- a/tests/data/test1570
+++ b/tests/data/test1570
@@ -26,9 +26,9 @@ REPLY EPSV 500 no such command
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP first type=D then regular URL
- </name>
+</name>
 <tool>
 lib1569
 </tool>

diff --git a/tests/data/test158 b/tests/data/test158
index 3110d805ad0a0f71b377c29a24a0b7159d766665..db3a49b7f57b633f70d181ec29b4127d1d0c749c 100644 (file)
--- a/tests/data/test158
+++ b/tests/data/test158
@@ -23,10 +23,10 @@ Mime
 <server>
 http
 </server>
- <name>
+<name>
 HTTP multipart formpost with only a 100 reply
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -F name=daniel
 </command>
 </client>

diff --git a/tests/data/test159 b/tests/data/test159
index 05968eb10ecb76ea13c571bb75b26c6f4fb48c3e..fabcb4f986245dfdf3683883c9947ff377a88555 100644 (file)
--- a/tests/data/test159
+++ b/tests/data/test159
@@ -50,16 +50,16 @@ debug
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with NTLM authorization when talking HTTP/1.0 (known to fail)
- </name>
+</name>
  <setenv>
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm -0
 </command>
 <precheck>

diff --git a/tests/data/test1590 b/tests/data/test1590
index dbb81cc29f503a756d47ad9ddd11cbaff42dad53..ea860215fed79983b2ccd5451654fb4efaad2753 100644 (file)
--- a/tests/data/test1590
+++ b/tests/data/test1590
@@ -34,9 +34,9 @@ Mime
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP cleanup before a connection was created
- </name>
+</name>
 # tool is what to use instead of 'curl'
 <tool>
 lib1553

diff --git a/tests/data/test1592 b/tests/data/test1592
index 6da96dc49228ba0557f8cafa0bd5e5ca44e785a9..e0adc0efc0850beecd7e9c7e477ef486cee32d07 100644 (file)
--- a/tests/data/test1592
+++ b/tests/data/test1592
@@ -18,11 +18,11 @@ none
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 HTTP request, remove handle while resolving, don't block
- </name>
+</name>
 
- <command>
+<command>
 http://a-site-never-accessed.example.org/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test16 b/tests/data/test16
index 240fd379cf1e4b62cc54582504c2150dab8f39c7..86fb55fb885782b215193da7164b63bf89e37957 100644 (file)
--- a/tests/data/test16
+++ b/tests/data/test16
@@ -27,10 +27,10 @@ the content goes here
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with proxy authorization
- </name>
- <command>
+</name>
+<command>
  -U fake@user:loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong -x %HOSTIP:%HTTPPORT http://we.want.that.site.com/%TESTNUMBER
 </command>
 <features>

diff --git a/tests/data/test160 b/tests/data/test160
index 32b0c73d52298346d9407390974e8cba4edde633..e74a40b66af12acfa47490ef357a3b813e5df19c 100644 (file)
--- a/tests/data/test160
+++ b/tests/data/test160
@@ -34,10 +34,10 @@ wait 1
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with delayed close, conn reuse, connection reset and retry
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/wantmore/%TESTNUMBER0001
 </command>
 </client>

diff --git a/tests/data/test1600 b/tests/data/test1600
index 33413d7c39f5c7dbc7dc6f7d159292232253b2a0..0705a0df37798ec130433168469b95c499d4d462 100644 (file)
--- a/tests/data/test1600
+++ b/tests/data/test1600
@@ -16,8 +16,8 @@ none
 unittest
 NTLM
 </features>
- <name>
+<name>
 NTLM unit tests
- </name>
+</name>
 </client>
 </testcase>

diff --git a/tests/data/test1601 b/tests/data/test1601
index 2065fdd1d84f924e4a006ca19a475e35780263c4..935f4e236dfad82a04751e289bc2ab7d3cf914e6 100644 (file)
--- a/tests/data/test1601
+++ b/tests/data/test1601
@@ -15,8 +15,8 @@ none
 <features>
 unittest
 </features>
- <name>
+<name>
 MD5 unit tests
- </name>
+</name>
 </client>
 </testcase>

diff --git a/tests/data/test1602 b/tests/data/test1602
index 56e243ff8a93890f97b46059e1545f208906b45f..546e8cbbdeac73b5f7670c4e24ef92fc055cbc0b 100644 (file)
--- a/tests/data/test1602
+++ b/tests/data/test1602
@@ -15,8 +15,8 @@ none
 <features>
 unittest
 </features>
- <name>
+<name>
 Internal hash create/add/destroy testing, exercising clean functions
- </name>
+</name>
 </client>
 </testcase>

diff --git a/tests/data/test1603 b/tests/data/test1603
index 406d197eeb6f10283d3bb7ea39abdfff06e93dcd..43cd3849d70a04e2273e9bee6f6482c90f1e9a0d 100644 (file)
--- a/tests/data/test1603
+++ b/tests/data/test1603
@@ -15,8 +15,8 @@ none
 <features>
 unittest
 </features>
- <name>
+<name>
 Internal hash add, retrieval, deletion testing
- </name>
+</name>
 </client>
 </testcase>

diff --git a/tests/data/test1604 b/tests/data/test1604
index 39daf9ddc58151969eee2bbeb81b758ed327deca..33e4e26c41582ece854a23c7962598f55ee94488 100644 (file)
--- a/tests/data/test1604
+++ b/tests/data/test1604
@@ -14,8 +14,8 @@ none
 <features>
 unittest
 </features>
- <name>
+<name>
 Test WIN32/MSDOS filename sanitization
- </name>
+</name>
 </client>
 </testcase>

diff --git a/tests/data/test1605 b/tests/data/test1605
index a123b01a1db04a37c4db54516e7d1ca6535baed2..d97c851787986613217e542a37e547b3325693b8 100644 (file)
--- a/tests/data/test1605
+++ b/tests/data/test1605
@@ -14,8 +14,8 @@ none
 <features>
 unittest
 </features>
- <name>
+<name>
 Test negative data lengths as input to libcurl functions
- </name>
+</name>
 </client>
 </testcase>

diff --git a/tests/data/test1606 b/tests/data/test1606
index 83e984427088a2bb11ba3ba771200b8db551b285..99104def2ba240991a13ffbc2e78e600a2b65d9d 100644 (file)
--- a/tests/data/test1606
+++ b/tests/data/test1606
@@ -15,8 +15,8 @@ none
 <features>
 unittest
 </features>
- <name>
+<name>
 verify speedcheck
- </name>
+</name>
 </client>
 </testcase>

diff --git a/tests/data/test1607 b/tests/data/test1607
index 6d28d6eb49f9e247bde6639ec6044cc7ebd06704..17f8a8159de1a7e57827852aa2042937bd1547e4 100644 (file)
--- a/tests/data/test1607
+++ b/tests/data/test1607
@@ -15,8 +15,8 @@ none
 <features>
 unittest
 </features>
- <name>
+<name>
 CURLOPT_RESOLVE parsing
- </name>
+</name>
 </client>
 </testcase>

diff --git a/tests/data/test1608 b/tests/data/test1608
index d037508b8493f852c06e3a8573405dfb4fac4bf0..c7d6a0a90cca86a3b61ac8736b29a2eb6ca665a3 100644 (file)
--- a/tests/data/test1608
+++ b/tests/data/test1608
@@ -16,8 +16,8 @@ none
 unittest
 shuffle-dns
 </features>
- <name>
+<name>
 verify DNS shuffling
- </name>
+</name>
 </client>
 </testcase>

diff --git a/tests/data/test1609 b/tests/data/test1609
index 6d28d6eb49f9e247bde6639ec6044cc7ebd06704..17f8a8159de1a7e57827852aa2042937bd1547e4 100644 (file)
--- a/tests/data/test1609
+++ b/tests/data/test1609
@@ -15,8 +15,8 @@ none
 <features>
 unittest
 </features>
- <name>
+<name>
 CURLOPT_RESOLVE parsing
- </name>
+</name>
 </client>
 </testcase>

diff --git a/tests/data/test161 b/tests/data/test161
index 53508e4b5f0b63e9e48d23284dae0801374dc74f..d8d7793761546e64b31fc12cc8cd7a0bf706797a 100644 (file)
--- a/tests/data/test161
+++ b/tests/data/test161
@@ -21,10 +21,10 @@ PASV
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP RETR PASV
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1610 b/tests/data/test1610
index fff973371de63cebb4421e61a25c396efb94c917..8ee68d43c4d472f8a014205c6796dd07160f456a 100644 (file)
--- a/tests/data/test1610
+++ b/tests/data/test1610
@@ -15,8 +15,8 @@ none
 <features>
 unittest
 </features>
- <name>
+<name>
 SHA256 unit tests
- </name>
+</name>
 </client>
 </testcase>

diff --git a/tests/data/test1611 b/tests/data/test1611
index 008aea7ec46601621e4a621c2d518dcc2fe8b9fd..ffd9de3cf44f7744056e7a6dca511a0c60cdc1a3 100644 (file)
--- a/tests/data/test1611
+++ b/tests/data/test1611
@@ -15,8 +15,8 @@ none
 <features>
 unittest
 </features>
- <name>
+<name>
 MD4 unit tests
- </name>
+</name>
 </client>
 </testcase>

diff --git a/tests/data/test1612 b/tests/data/test1612
index 3e92b6791209ac6938b25cd71feec6f15d7d19d5..e186a4a56d43bbf7854011e2d32f6dbdbb13bc3b 100644 (file)
--- a/tests/data/test1612
+++ b/tests/data/test1612
@@ -15,8 +15,8 @@ none
 <features>
 unittest
 </features>
- <name>
+<name>
 HMAC unit tests
- </name>
+</name>
 </client>
 </testcase>

diff --git a/tests/data/test1614 b/tests/data/test1614
index 73bdbb4e007b31060f196416236d4432df21065f..2c4d6abe9f8d93de1aeed8fe574e6f46e7824f34 100644 (file)
--- a/tests/data/test1614
+++ b/tests/data/test1614
@@ -15,9 +15,9 @@ none
 unittest
 proxy
 </features>
- <name>
+<name>
 noproxy and cidr comparisons
- </name>
+</name>
 </client>
 <errorcode>
 0

diff --git a/tests/data/test162 b/tests/data/test162
index 3fa291de529aac924d3c2ff0d9c631a144ad0e4c..ec0cd2545a32e0a6cf74908db4ce5999b940ae7a 100644 (file)
--- a/tests/data/test162
+++ b/tests/data/test162
@@ -34,10 +34,10 @@ proxy
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET asking for --proxy-ntlm when some other authentication is required
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-ntlm --fail
 </command>
 </client>

diff --git a/tests/data/test1620 b/tests/data/test1620
index 038bbcc1b47426dd5d540757d9f05b561426d5df..32f50994f2c39c05429d9e2988f95f03665ac5fb 100644 (file)
--- a/tests/data/test1620
+++ b/tests/data/test1620
@@ -15,8 +15,8 @@ none
 <features>
 unittest
 </features>
- <name>
+<name>
 unit tests for url.c
- </name>
+</name>
 </client>
 </testcase>

diff --git a/tests/data/test1621 b/tests/data/test1621
index 62c81052ff353793f003fd776eb759f61fe1650f..953440f29e27bc986de5b9bd70e74e5501b76e95 100644 (file)
--- a/tests/data/test1621
+++ b/tests/data/test1621
@@ -16,8 +16,8 @@ none
 unittest
 https
 </features>
- <name>
+<name>
 unit tests for stripcredentials from URL
- </name>
+</name>
 </client>
 </testcase>

diff --git a/tests/data/test163 b/tests/data/test163
index e143f73afffb160ef81291fbd30ed325970fd892..a3bf37530994d257d0a44a583d613aedba341022 100644 (file)
--- a/tests/data/test163
+++ b/tests/data/test163
@@ -26,10 +26,10 @@ Mime
 <server>
 http
 </server>
- <name>
+<name>
 HTTP multipart formpost with contents from a file
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F "name=<%LOGDIR/field%TESTNUMBER" -F tool=curl
 </command>
 # We create this file before the command is invoked!

diff --git a/tests/data/test1630 b/tests/data/test1630
index 4a983a9d5885713c277e5e6652f9612bda104082..35bc53fd414c6bc369633b611273333ee5a250b4 100644 (file)
--- a/tests/data/test1630
+++ b/tests/data/test1630
@@ -28,10 +28,10 @@ the content goes here
 http
 https-proxy
 </server>
- <name>
+<name>
 HTTPS-proxy with Basic auth to HTTP without auth
- </name>
- <command>
+</name>
+<command>
  -U fake@user:loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong -x https://%HOSTIP:%HTTPSPROXYPORT http://we.want.that.site.com/%TESTNUMBER --proxy-insecure
 </command>
 <features>

diff --git a/tests/data/test1631 b/tests/data/test1631
index 4c059870638651ee88a746a4c71704c9b40e5cca..83bc83e42e1e2e8709db8f67388930cd1475f800 100644 (file)
--- a/tests/data/test1631
+++ b/tests/data/test1631
@@ -39,10 +39,10 @@ companions always called me.
 ftp
 https-proxy
 </server>
- <name>
+<name>
 FTP through HTTPS-proxy
- </name>
- <command>
+</name>
+<command>
 -p -x https://%HOSTIP:%HTTPSPROXYPORT ftp://ftp.site.thru.https.proxy:%FTPPORT/%TESTNUMBER --proxy-insecure
 </command>
 <features>

diff --git a/tests/data/test1632 b/tests/data/test1632
index 830c5e8cb350b195bd07ba8dbd1c99760ced6b1a..18674d21ba4b302e1a7b1d6f8d84ff63a1d0a948 100644 (file)
--- a/tests/data/test1632
+++ b/tests/data/test1632
@@ -48,10 +48,10 @@ mother knew what became of me.
 ftp
 https-proxy
 </server>
- <name>
+<name>
 FTP through HTTPS-proxy, with connection reuse
- </name>
- <command>
+</name>
+<command>
 -p -x https://%HOSTIP:%HTTPSPROXYPORT ftp://ftp.site.thru.https.proxy:%FTPPORT/%TESTNUMBER --proxy-insecure ftp://ftp.site.thru.https.proxy:%FTPPORT/%TESTNUMBER0002
 </command>
 <features>

diff --git a/tests/data/test164 b/tests/data/test164
index 09310a0c28dcc30e368c930ceb344fe155a9845e..83f7a107a126d4da9b32d9f1883f505036fe40f2 100644 (file)
--- a/tests/data/test164
+++ b/tests/data/test164
@@ -44,10 +44,10 @@ Content-range: bytes 12-15/3781
 <server>
 http
 </server>
- <name>
+<name>
 HTTP range with multiple ranges
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -r 0-10,12-15
 </command>
 </client>

diff --git a/tests/data/test165 b/tests/data/test165
index dfd21315734eff88360e77bb70bb2675fa29fef3..d0353946a22952666d0b4d7f818af3b8944e1c28 100644 (file)
--- a/tests/data/test165
+++ b/tests/data/test165
@@ -38,10 +38,10 @@ LC_CTYPE=en_US.UTF-8
 <precheck>
 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
 </precheck>
- <name>
+<name>
 HTTP over proxy with IDN host name
- </name>
- <command>
+</name>
+<command>
 http://www.åäö.se/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT http://www.große.de/page/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test1650 b/tests/data/test1650
index 6248b9814d6f2057eadc855ce3964625197793ff..57a06f05e13aed3c238c74ef03e34fa4ee931676 100644 (file)
--- a/tests/data/test1650
+++ b/tests/data/test1650
@@ -16,8 +16,8 @@ none
 unittest
 DoH
 </features>
- <name>
+<name>
 DOH
- </name>
+</name>
 </client>
 </testcase>

diff --git a/tests/data/test1651 b/tests/data/test1651
index d29974bf20f9d8fd841a2a0e594f1c52c7ad5277..e552a8ad38cce6bdc6c10a57c4d1f5792c852990 100644 (file)
--- a/tests/data/test1651
+++ b/tests/data/test1651
@@ -15,8 +15,8 @@ none
 <features>
 unittest
 </features>
- <name>
+<name>
 x509 parsing
- </name>
+</name>
 </client>
 </testcase>

diff --git a/tests/data/test1655 b/tests/data/test1655
index e161fb6621bbb179046797f24ed5b7bc3c1f64d1..c5ec091292485c99d6adcb1f566cbf054c263c0e 100644 (file)
--- a/tests/data/test1655
+++ b/tests/data/test1655
@@ -16,8 +16,8 @@ none
 unittest
 DoH
 </features>
- <name>
+<name>
 unit test for doh_encode
- </name>
+</name>
 </client>
 </testcase>

diff --git a/tests/data/test166 b/tests/data/test166
index 58edaf094b8aeffd63e879d401602dac9b3d028f..0951b2359dce1f7a9029d5fdc0de4fd2ef00167f 100644 (file)
--- a/tests/data/test166
+++ b/tests/data/test166
@@ -26,10 +26,10 @@ Mime
 <server>
 http
 </server>
- <name>
+<name>
 HTTP formpost a file with spaces in name
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F "name=@%LOGDIR/fie ld %TESTNUMBER"
 </command>
 # We create this file before the command is invoked!

diff --git a/tests/data/test1661 b/tests/data/test1661
index 0e02d78d034f65868d0c338d388239dc59eea74d..5a648e51553dd760d0df25e744ec0f31a8c810f1 100644 (file)
--- a/tests/data/test1661
+++ b/tests/data/test1661
@@ -15,8 +15,8 @@ none
 <features>
 unittest
 </features>
- <name>
+<name>
 bufref unit tests
- </name>
+</name>
 </client>
 </testcase>

diff --git a/tests/data/test167 b/tests/data/test167
index 832cc35a6e80cc81ac85b059082695453b597ad1..031b92077f3ef8f0ab4a4e0e4cd7a5a1b3f8a14d 100644 (file)
--- a/tests/data/test167
+++ b/tests/data/test167
@@ -47,10 +47,10 @@ http
 crypto
 proxy
 </features>
- <name>
+<name>
 HTTP with proxy-requiring-Basic to site-requiring-Digest
- </name>
- <command>
+</name>
+<command>
 http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --digest --user digest:alot
 </command>
 </client>

diff --git a/tests/data/test168 b/tests/data/test168
index d552a71336453bc93c2596c922234a4d585621b0..d6d4e895cb9d85e4f68b6227b97f677b3016bdd8 100644 (file)
--- a/tests/data/test168
+++ b/tests/data/test168
@@ -61,10 +61,10 @@ http
 crypto
 proxy
 </features>
- <name>
+<name>
 HTTP with proxy-requiring-Digest to site-requiring-Digest
- </name>
- <command>
+</name>
+<command>
 http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-digest --digest --user digest:alot
 </command>
 </client>

diff --git a/tests/data/test17 b/tests/data/test17
index 8e5bf826774225d77a5739783b4d5cccc9d7f2b1..67d2a9fcc7507dfba400c4e20428af781284f22a 100644 (file)
--- a/tests/data/test17
+++ b/tests/data/test17
@@ -22,9 +22,9 @@ This is the proof it works
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with config file on stdin
- </name>
+</name>
  <stdin>
 #
 # Use a silly request without '--':
@@ -36,7 +36,7 @@ request MOOO
 # long option *with* '--':
 --max-time 180
  </stdin>
- <command>
+<command>
 -K - %HOSTIP:%HTTPPORT/that.site.com/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test170 b/tests/data/test170
index 22767cb5a69b5bbdb4181dff2632f9f30ff73fbc..f8c7357e681d325cd2a96d30a38473d6fb3c477a 100644 (file)
--- a/tests/data/test170
+++ b/tests/data/test170
@@ -24,10 +24,10 @@ SSL
 !SSPI
 proxy
 </features>
- <name>
+<name>
 HTTP POST with --proxy-ntlm and no SSL with no response
- </name>
- <command>
+</name>
+<command>
 http://a.galaxy.far.far.away/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-ntlm -F "dummy=value"
 </command>
 </client>

diff --git a/tests/data/test1700 b/tests/data/test1700
index 7f78bcf5f92eda6df38db5a84e48523b683bfaa5..8d1fff5801d318e546586e98a7b277c2a23a9067 100644 (file)
--- a/tests/data/test1700
+++ b/tests/data/test1700
@@ -45,10 +45,10 @@ h2c
 http
 http/2
 </server>
- <name>
+<name>
 HTTP/2 GET with Upgrade:
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTP2PORT/%TESTNUMBER --http2 http://%HOSTIP:%HTTP2PORT/%TESTNUMBER0001
 </command>
 </client>

diff --git a/tests/data/test1701 b/tests/data/test1701
index 22f6147d0503a9442cf2c54cadf8e9f2f9a72680..c81862aeb5e424a2a95f8b3b5b40c91e90c58258 100644 (file)
--- a/tests/data/test1701
+++ b/tests/data/test1701
@@ -36,10 +36,10 @@ h2c
 http
 http/2
 </server>
- <name>
+<name>
 HTTP/2 POST with Upgrade:
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTP2PORT/%TESTNUMBER --http2 -d "datatosend"
 </command>
 </client>

diff --git a/tests/data/test1702 b/tests/data/test1702
index 1da9bc6b585771b58608b3f9b4d744ec375c6248..ced2ca06ce5a3a32a384066ba8e51b1e0e27f2e8 100644 (file)
--- a/tests/data/test1702
+++ b/tests/data/test1702
@@ -35,10 +35,10 @@ h2c
 http
 http/2
 </server>
- <name>
+<name>
 HTTP/2 HEAD with Upgrade:
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTP2PORT/%TESTNUMBER --http2 --head
 </command>
 </client>

diff --git a/tests/data/test171 b/tests/data/test171
index d56296f4e6e74666fa9e7e3055ed8a9ce8ec6920..a03ec8a6883faefb54911280bcba6e5a1e056386 100644 (file)
--- a/tests/data/test171
+++ b/tests/data/test171
@@ -27,10 +27,10 @@ This server reply is for testing a simple cookie test case...
 <server>
 http
 </server>
- <name>
+<name>
 HTTP, get cookie with dot prefixed full domain
- </name>
- <command>
+</name>
+<command>
 -c %LOGDIR/jar%TESTNUMBER -x %HOSTIP:%HTTPPORT http://z.x.com/%TESTNUMBER
 </command>
 <features>

diff --git a/tests/data/test172 b/tests/data/test172
index e638fc42e007d11b79a32defefb85c210796109d..3a9a9ed6648aa97fb0a6584a6928ed64a981959f 100644 (file)
--- a/tests/data/test172
+++ b/tests/data/test172
@@ -23,10 +23,10 @@ boo
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with cookies file and custom added cookie
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b %LOGDIR/jar%TESTNUMBER.txt -b "tool=curl; name=fool"
 </command>
 <file name="%LOGDIR/jar%TESTNUMBER.txt">

diff --git a/tests/data/test173 b/tests/data/test173
index e3d613e00276e526cffa5b894ebd350659208d53..a4bffcd9a8ab20a4d95d0d0f6458caf27a2af96a 100644 (file)
--- a/tests/data/test173
+++ b/tests/data/test173
@@ -27,10 +27,10 @@ Mime
 <server>
 http
 </server>
- <name>
+<name>
 HTTP RFC1867-formpost a file from stdin with "faked" filename
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F field1=contents1 -F "fileupload=@-;filename=/dev/null;type=text/x-null;format=x-curl"
 </command>
 

diff --git a/tests/data/test174 b/tests/data/test174
index b0b7c5f7a4b276f6aa2794b4ffbd2502d1c396ce..a3d1d080aaaceea959b798ccccbfd88652088c8e 100644 (file)
--- a/tests/data/test174
+++ b/tests/data/test174
@@ -25,10 +25,10 @@ This is not the real page
 <server>
 http
 </server>
- <name>
+<name>
 HTTP POST --anyauth to server not requiring any auth at all
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth -d "junkelijunk"
 </command>
 </client>

diff --git a/tests/data/test175 b/tests/data/test175
index 382e1a70bd9e257f4b82ec28f837767d55ff5406..19537ebf3e6426f5973994d5aafb1fbaf24a5a87 100644 (file)
--- a/tests/data/test175
+++ b/tests/data/test175
@@ -52,10 +52,10 @@ http
 <features>
 crypto
 </features>
- <name>
+<name>
 HTTP POST --digest to server not requiring any auth at all
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -d "junkelijunk"
 </command>
 </client>

diff --git a/tests/data/test176 b/tests/data/test176
index 07ace476d6f3dc65fbb4cea4d58cfc7580c4fb64..eba8fef78ce9c77ff4879e4cecfd4f0eefdf4e41 100644 (file)
--- a/tests/data/test176
+++ b/tests/data/test176
@@ -54,10 +54,10 @@ SSL
 <server>
 http
 </server>
- <name>
+<name>
 HTTP POST --ntlm to server not requiring any auth at all
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --ntlm -d "junkelijunk"
 </command>
 </client>

diff --git a/tests/data/test177 b/tests/data/test177
index 6ee5fd06e06abb2066eb635d5b0e6c2a8b1244a2..528b722d6f44ee673665710cf0a2f71392be796f 100644 (file)
--- a/tests/data/test177
+++ b/tests/data/test177
@@ -28,10 +28,10 @@ http
 <features>
 crypto
 </features>
- <name>
+<name>
 HTTP POST --digest to server doing a 302-location response
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -d "junkelijunk"
 </command>
 </client>

diff --git a/tests/data/test178 b/tests/data/test178
index 03c1a441d7b5b97e6b8a230e0415b9d7130509b7..94ea47ecb3970be44f5a41bcc9c8eda26888f39b 100644 (file)
--- a/tests/data/test178
+++ b/tests/data/test178
@@ -33,10 +33,10 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 <server>
 http
 </server>
- <name>
+<name>
 HTTP response with negative Content-Length
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test179 b/tests/data/test179
index 62a8d8c651f14a297191c486f55bf304ac3a0cfb..e3869b7fbf166d06fe4159ff2a17cbe743ec3a15 100644 (file)
--- a/tests/data/test179
+++ b/tests/data/test179
@@ -27,10 +27,10 @@ This server says moo
 <server>
 http
 </server>
- <name>
+<name>
 HTTP using proxy and cookies with path checks
- </name>
- <command>
+</name>
+<command>
 http://supertrooper.fake/c/%TESTNUMBER -b %LOGDIR/injar%TESTNUMBER -x %HOSTIP:%HTTPPORT
 </command>
 <file name="%LOGDIR/injar%TESTNUMBER">

diff --git a/tests/data/test18 b/tests/data/test18
index 888745889dd25081e4d92af63eb2fb6fd925d272..ae31da29e758e6fa968e2b462886c241d9d1ce45 100644 (file)
--- a/tests/data/test18
+++ b/tests/data/test18
@@ -37,10 +37,10 @@ hoo
 <server>
 http
 </server>
- <name>
+<name>
 multiple requests using {} in URL
- </name>
- <command>
+</name>
+<command>
 "%HOSTIP:%HTTPPORT/{%TESTNUMBER,%TESTNUMBER0002,%TESTNUMBER0003}"
 </command>
 </client>

diff --git a/tests/data/test180 b/tests/data/test180
index dcb616fd0523ff1522ec938cc7d3f58457346704..62a505d5fa9780982a19b87ca3961789978c3838 100644 (file)
--- a/tests/data/test180
+++ b/tests/data/test180
@@ -23,10 +23,10 @@ blablabla
 <server>
 http
 </server>
- <name>
+<name>
 HTTP 1.0 PUT
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt --http1.0
 </command>
 <file name="%LOGDIR/test%TESTNUMBER.txt">

diff --git a/tests/data/test1800 b/tests/data/test1800
index 1f4472d9a10e0cb8c8080afaac382a3c65ecc001..de315d063c1a99ff971efcd1677b1d8c44c83199 100644 (file)
--- a/tests/data/test1800
+++ b/tests/data/test1800
@@ -32,10 +32,10 @@ http
 <features>
 http/2
 </features>
- <name>
+<name>
 HTTP/2 upgrade refused
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http2
 </command>
 

diff --git a/tests/data/test1801 b/tests/data/test1801
index 9494e92d8aaf93aa089281fe84039ec34f0d7427..a65a2d5d4560956efb8f27ab03cf6f018a55aa51 100644 (file)
--- a/tests/data/test1801
+++ b/tests/data/test1801
@@ -39,10 +39,10 @@ http
 <features>
 http/2
 </features>
- <name>
+<name>
 HTTP/2 upgrade with lying server
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http2
 </command>
 

diff --git a/tests/data/test181 b/tests/data/test181
index 71dd427bf43bd931085cd214e872862c22e0ba24..685b244129480de4d1b374391eb4fb2907213b42 100644 (file)
--- a/tests/data/test181
+++ b/tests/data/test181
@@ -23,10 +23,10 @@ blablabla
 <server>
 http
 </server>
- <name>
+<name>
 HTTP 1.0 POST
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --data-binary @%LOGDIR/test%TESTNUMBER.txt --http1.0
 </command>
 <file name="%LOGDIR/test%TESTNUMBER.txt">

diff --git a/tests/data/test183 b/tests/data/test183
index 77d9d04f7d80e9ad76f329e82d1f686dff6415cd..ba0df8c2feae3a2633c6c357f7127c1ad6d542ec 100644 (file)
--- a/tests/data/test183
+++ b/tests/data/test183
@@ -24,10 +24,10 @@ moo
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET two URLs over a single proxy with persistent connection
- </name>
- <command>
+</name>
+<command>
 http://deathstar.another.galaxy/%TESTNUMBER http://a.galaxy.far.far.away/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT
 </command>
 <features>

diff --git a/tests/data/test184 b/tests/data/test184
index 9c795a28832c130a8a3372a6660697f75b8aeb40..95c9e288b731aa6882eb36d9cd5fb5653d2acfc9 100644 (file)
--- a/tests/data/test184
+++ b/tests/data/test184
@@ -44,10 +44,10 @@ moo
 <server>
 http
 </server>
- <name>
+<name>
 HTTP replace Host: when following Location: to new host
- </name>
- <command>
+</name>
+<command>
 http://deathstar.another.galaxy/%TESTNUMBER -L -H "Host: another.visitor.stay.a.while.stay.foreeeeeever" --proxy http://%HOSTIP:%HTTPPORT
 </command>
 <features>

diff --git a/tests/data/test185 b/tests/data/test185
index d614c1040606c451e259cb0c9926e4ff67131d5d..81093d2b0648d6f05615a75420bdf6443d73f2b8 100644 (file)
--- a/tests/data/test185
+++ b/tests/data/test185
@@ -44,10 +44,10 @@ moo
 <server>
 http
 </server>
- <name>
+<name>
 HTTP replace Host: when following Location: on the same host
- </name>
- <command>
+</name>
+<command>
 http://deathstar.another.galaxy/%TESTNUMBER -L -H "Host: another.visitor.stay.a.while.stay.foreeeeeever" --proxy http://%HOSTIP:%HTTPPORT
 </command>
 <features>

diff --git a/tests/data/test186 b/tests/data/test186
index ce1a2d1497612448dd13fc373c8d24e37f055139..f5c071946f033c88c86abd176802364c9c617f6b 100644 (file)
--- a/tests/data/test186
+++ b/tests/data/test186
@@ -27,10 +27,10 @@ Mime
 <server>
 http
 </server>
- <name>
+<name>
 HTTP RFC1867-type formposting with types on text fields
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F "name=daniel;type=moo/foo" -F "html= <body>hello</body>;type=text/html;charset=verymoo"
 </command>
 # We create this file before the command is invoked!

diff --git a/tests/data/test187 b/tests/data/test187
index 2d5d0a883cc7b950fa4084c120ff3ad84aeb9572..aff3a9d1ade83b6bbbeea216ecb34e567f70d1fd 100644 (file)
--- a/tests/data/test187
+++ b/tests/data/test187
@@ -50,10 +50,10 @@ If this is received, the location following worked
 <server>
 http
 </server>
- <name>
+<name>
 HTTP redirect with bad host name separation and slash in parameters
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT?oh=what-weird=test/%TESTNUMBER -L
 </command>
 </client>

diff --git a/tests/data/test188 b/tests/data/test188
index 8e8848e65a568b99a4ca6bad14c00548a74fa62b..00d29990f8eb83913b704af0205d04f25e496c8b 100644 (file)
--- a/tests/data/test188
+++ b/tests/data/test188
@@ -47,10 +47,10 @@ Actual content
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with resume and redirect
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 50 -L
 </command>
 </client>

diff --git a/tests/data/test189 b/tests/data/test189
index e747d35268b706a6995d99e6c7fb8527abd04bd3..f4ff1fa366adb344fc5313f199dfe9e8d525fd3a 100644 (file)
--- a/tests/data/test189
+++ b/tests/data/test189
@@ -41,10 +41,10 @@ Content-Length: 15
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with resume and redirect (to a page that doesn't resume)
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 50 -L
 </command>
 </client>

diff --git a/tests/data/test19 b/tests/data/test19
index f053baf08b1d305b83fb815d11b5a0050a152e94..265a74ad884db7ffed27cdcd5f41e70da531cb5f 100644 (file)
--- a/tests/data/test19
+++ b/tests/data/test19
@@ -20,10 +20,10 @@ none
 <features>
 http
 </features>
- <name>
+<name>
 attempt connect to non-listening socket
- </name>
- <command>
+</name>
+<command>
 %HOSTIP:%NOLISTENPORT
 </command>
 </client>

diff --git a/tests/data/test190 b/tests/data/test190
index 61237ed0fe2e33615ddcbcfc119a863114253b6b..b0328fdcb56def05abb49e694294caa73e0feb14 100644 (file)
--- a/tests/data/test190
+++ b/tests/data/test190
@@ -23,10 +23,10 @@ ftp
 <killserver>
 ftp
 </killserver>
- <name>
+<name>
 FTP download with strict timeout and slow CWD
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/path/to/file/%TESTNUMBER -m %FTPTIME2
 </command>
 </client>

diff --git a/tests/data/test1903 b/tests/data/test1903
index ff5a0f29dd7232c4c4c9a4afe7311419fc06495f..d256e6223e594c02a5115b3f011728cf48c1aa58 100644 (file)
--- a/tests/data/test1903
+++ b/tests/data/test1903
@@ -26,9 +26,9 @@ Set-Cookie: secondcookie=present;
 <server>
 http
 </server>
- <name>
+<name>
 CURLOPT_COOKIEFILE then reset then set again
- </name>
+</name>
 <tool>
 lib%TESTNUMBER
 </tool>

diff --git a/tests/data/test1904 b/tests/data/test1904
index 5254c6379dd76f2db366d7f260b2b21c897f6e59..8f005365f6d84cfabecf5c1f5882f8844b1c6987 100644 (file)
--- a/tests/data/test1904
+++ b/tests/data/test1904
@@ -47,10 +47,10 @@ contents
 http
 http-proxy
 </server>
- <name>
+<name>
 HTTP CONNECT with 204 response
- </name>
- <command>
+</name>
+<command>
 http://test.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER -p --proxy %HOSTIP:%PROXYPORT
 </command>
 <features>

diff --git a/tests/data/test1905 b/tests/data/test1905
index 308dc9a39532a71230396ddbdcfe3a7757462601..a17425e42d701192482d03722ba3519311675943 100644 (file)
--- a/tests/data/test1905
+++ b/tests/data/test1905
@@ -26,9 +26,9 @@ Set-Cookie: secondcookie=present;
 <server>
 http
 </server>
- <name>
+<name>
 CURLOPT_COOKIELIST set to "FLUSH" of a shared cookie object
- </name>
+</name>
 <tool>
 lib%TESTNUMBER
 </tool>

diff --git a/tests/data/test1906 b/tests/data/test1906
index 61cc04578ac47c8dc3b070172bded2375e551d36..6769d0cdb0eee596ee025fe842bf974ad883314e 100644 (file)
--- a/tests/data/test1906
+++ b/tests/data/test1906
@@ -23,9 +23,9 @@ Funny-head: yesyes swsclose
 <server>
 http
 </server>
- <name>
+<name>
 CURLOPT_CURLU and CURLOPT_PORT
- </name>
+</name>
 <tool>
 lib%TESTNUMBER
 </tool>

diff --git a/tests/data/test1907 b/tests/data/test1907
index 8536addde4ce00273230e1e4e0e0a574993c947c..31a4cbc2d04a78c349e3e4dc2b098fc8fb2427b1 100644 (file)
--- a/tests/data/test1907
+++ b/tests/data/test1907
@@ -23,9 +23,9 @@ Content-Length: 0
 <server>
 http
 </server>
- <name>
+<name>
 CURLINFO_EFFECTIVE_URL with non-scheme URL
- </name>
+</name>
 <tool>
 lib%TESTNUMBER
 </tool>

diff --git a/tests/data/test1909 b/tests/data/test1909
index c412d41e06acc35cba74adc64a5cabc26dfd6e23..2d868cc0bb60427495d9751384feea2abe748248 100644 (file)
--- a/tests/data/test1909
+++ b/tests/data/test1909
@@ -32,9 +32,9 @@ data
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET --retry-all-errors to overcome partial transfer
- </name>
+</name>
  <command option="no-output,no-include">
 --retry 1 --retry-all-errors -o %LOGDIR/outfile%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>

diff --git a/tests/data/test191 b/tests/data/test191
index e6e701173d3e5129a416b8f8e8f0ba3b9b4bb818..0293693631296db72e6ead0e740d3be3d30f2c3d 100644 (file)
--- a/tests/data/test191
+++ b/tests/data/test191
@@ -17,10 +17,10 @@ data in file
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP URL with ?-letters in username and password
- </name>
- <command>
+</name>
+<command>
 "ftp://use%3fr:pass%3fword@%HOSTIP:%FTPPORT/%TESTNUMBER"
 </command>
 </client>

diff --git a/tests/data/test192 b/tests/data/test192
index 7edf316867db8b8eee9ea7aa770aca541592618f..12ed68db641ab1f54193022eeafc1d6bc5a53425 100644 (file)
--- a/tests/data/test192
+++ b/tests/data/test192
@@ -25,10 +25,10 @@ monster
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET -w num_connects with one simple connect
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n"
 </command>
 </client>

diff --git a/tests/data/test193 b/tests/data/test193
index 4403b2c5e9757fb0b9c7a8892360abe1cb215652..9e4dac0448f06e3515d1ec00f4eff41f0e5bdaa8 100644 (file)
--- a/tests/data/test193
+++ b/tests/data/test193
@@ -37,10 +37,10 @@ monster
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET -w num_connects with redirected fetch (2 connects)
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n" -L
 </command>
 </client>

diff --git a/tests/data/test194 b/tests/data/test194
index 924e9a940bfacad6d95bd07669f97fe6feebe9d6..4de767e3af47b4cb187777271c556329d012e78c 100644 (file)
--- a/tests/data/test194
+++ b/tests/data/test194
@@ -46,10 +46,10 @@ Connection: close
 <server>
 http
 </server>
- <name>
+<name>
 HTTP resume transfer with the whole file already downloaded and --fail
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -C 87 --fail
 </command>
 </client>

diff --git a/tests/data/test195 b/tests/data/test195
index 920ab8af32f2edcd15cf4b5527d42271a98db07e..be0c206d675f1d86799ba1d8ca482ddbfc28a3e4 100644 (file)
--- a/tests/data/test195
+++ b/tests/data/test195
@@ -17,10 +17,10 @@ REPLY PASS 530 temporarily not available
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP response 530 after PASS, temporarily not allowed access
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test196 b/tests/data/test196
index 715a6ce675ab4be9f22ab3f019addf258b13e218..b1a684f10808a3f58ecc864fa582c137ef104d76 100644 (file)
--- a/tests/data/test196
+++ b/tests/data/test196
@@ -18,10 +18,10 @@ REPLY PASS 430 temporarily not available
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP transient error, retry request once
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --retry 1
 </command>
 </client>

diff --git a/tests/data/test197 b/tests/data/test197
index 3c5b8abff96a6e938cfcec5f69252e2a10bfc84e..d940b0dc38e9ec6b8b28fca86c561501f8babb49 100644 (file)
--- a/tests/data/test197
+++ b/tests/data/test197
@@ -33,10 +33,10 @@ ok
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET --retry on 503 error with output to stdout
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --retry 1000
 </command>
 </client>

diff --git a/tests/data/test198 b/tests/data/test198
index 08fafde6cd746507621fb065515b844bb98c0300..95b1f99e1cef15c4a0e91a0e5c5c4b61ff118061 100644 (file)
--- a/tests/data/test198
+++ b/tests/data/test198
@@ -42,10 +42,10 @@ ok
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET --retry on 503 error with output to file
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --retry 1000
 </command>
 </client>

diff --git a/tests/data/test199 b/tests/data/test199
index b997c5c4bb6bdc1fdfda213ce71e6db655302a38..1289fd2d9b334bd4747cabca15ffc5f30fb85e00 100644 (file)
--- a/tests/data/test199
+++ b/tests/data/test199
@@ -31,10 +31,10 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with -d, -G and {}
- </name>
- <command>
+</name>
+<command>
 -d "foo=moo&moo=poo" "http://%HOSTIP:%HTTPPORT/{%TESTNUMBER,%TESTNUMBER}" -G
 </command>
 </client>

diff --git a/tests/data/test2 b/tests/data/test2
index 80e47b082af7edee4924b04b738a4065c2afc111..f9cef90a7dc9bda7c0aab219c6aff0f2359be254 100644 (file)
--- a/tests/data/test2
+++ b/tests/data/test2
@@ -25,10 +25,10 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with user and password
- </name>
- <command>
+</name>
+<command>
  -u fake:user http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test20 b/tests/data/test20
index 910cb54c20b6a0fcd28f70a469d6ca878b651e54..23844880676a4b7dcfd750015b45b223cc6c41d1 100644 (file)
--- a/tests/data/test20
+++ b/tests/data/test20
@@ -21,10 +21,10 @@ none
 <features>
 http
 </features>
- <name>
+<name>
 attempt connect to non-existing host name
- </name>
- <command>
+</name>
+<command>
 --ipv4 non-existing-host.haxx.se.
 </command>
 </client>

diff --git a/tests/data/test200 b/tests/data/test200
index 7ce2cbcfeafe2c011a817add5416629b8ca567fe..1a81ac82565dddc38194eb863cbc57e8b6a999fc 100644 (file)
--- a/tests/data/test200
+++ b/tests/data/test200
@@ -20,9 +20,9 @@ moo
 <server>
 file
 </server>
- <name>
+<name>
 basic file:// file
- </name>
+</name>
 <command option="no-include">
 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt
 </command>

diff --git a/tests/data/test2000 b/tests/data/test2000
index b114dd8affba0ee2337098a0021d2ad0e9b08bf7..032bf5b1b4533eb1bc6920e682d2dac6b2b41896 100644 (file)
--- a/tests/data/test2000
+++ b/tests/data/test2000
@@ -28,9 +28,9 @@ works
 ftp
 file
 </server>
- <name>
+<name>
 FTP RETR followed by FILE
- </name>
+</name>
 <command option="no-include">
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt
 </command>

diff --git a/tests/data/test2001 b/tests/data/test2001
index f1e71467539fbb2266f9df6e76ef0ecd8476d2f1..de1673531322af73e5d43539caec15e399af43da 100644 (file)
--- a/tests/data/test2001
+++ b/tests/data/test2001
@@ -45,9 +45,9 @@ http
 ftp
 file
 </server>
- <name>
+<name>
 HTTP GET followed by FTP RETR followed by FILE
- </name>
+</name>
 <command option="no-include">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt
 </command>

diff --git a/tests/data/test2002 b/tests/data/test2002
index e06490b95873a102629d67b1a5941d7473404ac1..4b2b4fef6942576c1b552da0c53fd1458003b5bd 100644 (file)
--- a/tests/data/test2002
+++ b/tests/data/test2002
@@ -54,9 +54,9 @@ ftp
 file
 tftp
 </server>
- <name>
+<name>
 HTTP GET followed by FTP RETR followed by FILE followed by TFTP RRQ
- </name>
+</name>
 <command option="no-include">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER0003
 </command>

diff --git a/tests/data/test2003 b/tests/data/test2003
index 9054a8d4a58a8d065676094eaa8cd72748a86582..dcd8621789406eccffca9f0a936a27c06aaf1732 100644 (file)
--- a/tests/data/test2003
+++ b/tests/data/test2003
@@ -54,9 +54,9 @@ ftp
 file
 tftp
 </server>
- <name>
+<name>
 HTTP GET followed by FTP RETR followed by FILE followed by TFTP RRQ then again in reverse order
- </name>
+</name>
 <command option="no-include">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER0003 tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER0003 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002 http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001
 </command>

diff --git a/tests/data/test2004 b/tests/data/test2004
index 80463569c6edb95c75bbf7dc7365777ef8e41d92..404b354cec8bc06d9270388154733ae8740789de 100644 (file)
--- a/tests/data/test2004
+++ b/tests/data/test2004
@@ -26,9 +26,9 @@ for tftp test
 tftp
 sftp
 </server>
- <name>
+<name>
 TFTP RRQ followed by SFTP retrieval followed by FILE followed by SCP retrieval then again in reverse order
- </name>
+</name>
 <command option="no-include">
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.txt file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.txt file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER --insecure
 </command>

diff --git a/tests/data/test201 b/tests/data/test201
index b68abb8c00537bd810309fc7276637f6a6c75ee2..aff9ca2b81d2387f0d43f95573178894ff3bd01b 100644 (file)
--- a/tests/data/test201
+++ b/tests/data/test201
@@ -17,10 +17,10 @@ FAILURE
 <server>
 file
 </server>
- <name>
+<name>
 missing file:// file
- </name>
- <command>
+</name>
+<command>
 file://localhost/%PWD/%LOGDIR/non-existent-file.txt
 </command>
 </client>

diff --git a/tests/data/test202 b/tests/data/test202
index f2fb078f21865305077de5d4965307c58c77840f..8c1f9964afa17f1972af3c6aaddc1c628db166a1 100644 (file)
--- a/tests/data/test202
+++ b/tests/data/test202
@@ -16,9 +16,9 @@ FILE
 <server>
 file
 </server>
- <name>
+<name>
 two file:// URLs to stdout
- </name>
+</name>
 <command option="no-include">
 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt FILE://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt
 </command>

diff --git a/tests/data/test2023 b/tests/data/test2023
index 08fb5cc008388d52f60872813da71ac56f7ef041..e395ece9d6a604ed9c53fb1250dc28a63212b537 100644 (file)
--- a/tests/data/test2023
+++ b/tests/data/test2023
@@ -109,16 +109,16 @@ http
 libauthretry
 </tool>
 
- <name>
+<name>
 HTTP authorization retry (Basic)
- </name>
+</name>
  <setenv>
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER basic basic
 </command>
 <precheck>

diff --git a/tests/data/test2024 b/tests/data/test2024
index d371e5dcbe9ee5c08b92214232ca19e5f59bf639..07bf931a2266f7dc140d1223b5013bd97b93be39 100644 (file)
--- a/tests/data/test2024
+++ b/tests/data/test2024
@@ -123,16 +123,16 @@ crypto
 libauthretry
 </tool>
 
- <name>
+<name>
 HTTP authorization retry (Basic switching to Digest)
- </name>
+</name>
  <setenv>
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER basic digest
 </command>
 <precheck>

diff --git a/tests/data/test2026 b/tests/data/test2026
index 963587ef2e4314a6548a7a624045442226cb142f..81d252a3053c449cbddd2ad033fba022ef62583b 100644 (file)
--- a/tests/data/test2026
+++ b/tests/data/test2026
@@ -159,16 +159,16 @@ crypto
 libauthretry
 </tool>
 
- <name>
+<name>
 HTTP authorization retry (Digest switching to Basic)
- </name>
+</name>
  <setenv>
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER digest basic
 </command>
 <precheck>

diff --git a/tests/data/test2027 b/tests/data/test2027
index ecc5a63d87d0ddb8dc4ce8f39904e24650982fe5..0a9338777f8afd807aeca03d60a64910890fd245 100644 (file)
--- a/tests/data/test2027
+++ b/tests/data/test2027
@@ -182,16 +182,16 @@ crypto
 libauthretry
 </tool>
 
- <name>
+<name>
 HTTP authorization retry (Digest)
- </name>
+</name>
  <setenv>
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER digest digest
 </command>
 <precheck>

diff --git a/tests/data/test203 b/tests/data/test203
index 496a4148253c6934bd676adc8b4c23d023d84873..ed388f615094f9458ec562dde1c26faa5b5448ac 100644 (file)
--- a/tests/data/test203
+++ b/tests/data/test203
@@ -21,9 +21,9 @@ moo
 <server>
 file
 </server>
- <name>
+<name>
 file:/path URL with a single slash
- </name>
+</name>
 <setenv>
 # Needed for MSYS2 to not convert
 MSYS2_ARG_CONV_EXCL=file:

diff --git a/tests/data/test2033 b/tests/data/test2033
index 0645932a43ce222cec0357554bd95ff8d855b67a..2a9f90091fe7b3b541d0897c157c5fc32bc6aeab 100644 (file)
--- a/tests/data/test2033
+++ b/tests/data/test2033
@@ -31,14 +31,14 @@ Schannel
 <server>
 https Server-localhost-sv.pem
 </server>
- <name>
+<name>
 simple HTTPS GET with DER public key pinning (Schannel variant)
- </name>
+</name>
  <setenv>
 # This test is pointless if we're not using the schannel backend
 CURL_SSL_BACKEND=schannel
  </setenv>
- <command>
+<command>
 --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey %SRCDIR/certs/Server-localhost-sv.pub.der --ssl-revoke-best-effort https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name

diff --git a/tests/data/test2034 b/tests/data/test2034
index 83f984a1d18c516607ac41374566137f3fcba06e..5192cb73ea157f05f6434791e90875b23490cbd0 100644 (file)
--- a/tests/data/test2034
+++ b/tests/data/test2034
@@ -31,10 +31,10 @@ SSLpinning
 <server>
 https Server-localhost-sv.pem
 </server>
- <name>
+<name>
 simple HTTPS GET with DER public key pinning
- </name>
- <command>
+</name>
+<command>
 --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey %SRCDIR/certs/Server-localhost-sv.pub.der https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name

diff --git a/tests/data/test2035 b/tests/data/test2035
index 8380022aae276050a56bab45a4a87257878d63d3..b17cddd567cb303ef59fff660cf68b927049f17a 100644 (file)
--- a/tests/data/test2035
+++ b/tests/data/test2035
@@ -22,10 +22,10 @@ SSLpinning
 <server>
 https Server-localhost-sv.pem
 </server>
- <name>
+<name>
 HTTPS wrong DER pinnedpubkey but right CN
- </name>
- <command>
+</name>
+<command>
 --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey %SRCDIR/certs/Server-localhost-sv.der https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name

diff --git a/tests/data/test2036 b/tests/data/test2036
index f022d1444d019b6f6fc6e976cb7eb059259fde13..9fd89a2ac5d907ad71f1794cd57e5049db653baa 100644 (file)
--- a/tests/data/test2036
+++ b/tests/data/test2036
@@ -18,9 +18,9 @@ none
 <features>
 http
 </features>
- <name>
+<name>
 HTTP, -O with no slash at all in the URL
- </name>
+</name>
  <command option="no-output">
 %HOSTIP:%NOLISTENPORT -O
 </command>

diff --git a/tests/data/test2037 b/tests/data/test2037
index 2b17e538375276635163cd618d596cb36477ef4d..96406410aa227223a2d878990ff62ed42d2dcf55 100644 (file)
--- a/tests/data/test2037
+++ b/tests/data/test2037
@@ -31,10 +31,10 @@ SSLpinning
 <server>
 https Server-localhost-sv.pem
 </server>
- <name>
+<name>
 simple HTTPS GET with PEM public key pinning
- </name>
- <command>
+</name>
+<command>
 --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey %SRCDIR/certs/Server-localhost-sv.pub.pem https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name

diff --git a/tests/data/test2038 b/tests/data/test2038
index d9bf7c6434f9e4ed03168b2302c4a7582836da1a..6cd91d623118c990fdce076e6ff4fadad0811e7a 100644 (file)
--- a/tests/data/test2038
+++ b/tests/data/test2038
@@ -22,10 +22,10 @@ SSLpinning
 <server>
 https Server-localhost-sv.pem
 </server>
- <name>
+<name>
 HTTPS wrong PEM pinnedpubkey but right CN
- </name>
- <command>
+</name>
+<command>
 --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey %SRCDIR/certs/Server-localhost-sv.pem https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name

diff --git a/tests/data/test2039 b/tests/data/test2039
index 25ecf278a628152229fccff8be160ef830f68def..fdb61ed0243cb8b5d7176fa994d0596324898569 100644 (file)
--- a/tests/data/test2039
+++ b/tests/data/test2039
@@ -33,10 +33,10 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP (optional .netrc with 'default' override; no user/pass) dir list PASV
- </name>
- <command>
+</name>
+<command>
 --netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER ftp://%HOSTIP:%FTPPORT/
 </command>
 <file name="%LOGDIR/netrc%TESTNUMBER" >

diff --git a/tests/data/test204 b/tests/data/test204
index 63d17cd57dad8ad17ac1e5ba00efabbb57912af3..ffe4657a7eaccf41063cced8cbc31047a5ba0284 100644 (file)
--- a/tests/data/test204
+++ b/tests/data/test204
@@ -12,9 +12,9 @@ FILE
 <server>
 file
 </server>
- <name>
+<name>
 "upload" with file://
- </name>
+</name>
 <command option="no-include">
 file://localhost%FILE_PWD/%LOGDIR/result%TESTNUMBER.txt -T %LOGDIR/upload%TESTNUMBER.txt
 </command>

diff --git a/tests/data/test2041 b/tests/data/test2041
index f007f47c4c23966c92b20b5a408b2638507dfbb2..b7b461e0d00ba4402dbe869deeaed5904f2e7cbe 100644 (file)
--- a/tests/data/test2041
+++ b/tests/data/test2041
@@ -31,10 +31,10 @@ SSLpinning
 <server>
 https Server-localhost-sv.pem
 </server>
- <name>
+<name>
 simple HTTPS GET with base64-sha256 public key pinning
- </name>
- <command>
+</name>
+<command>
 --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey sha256//AAUDLk4c98xcFUDvA9i/MnA9HuO03IPi15r+Cx9OXnc= https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name

diff --git a/tests/data/test2042 b/tests/data/test2042
index b6b9bcc5aea89970baf3975bc15d75185d4c636b..594a7e460af2ea1c94e3653ea0bb38bdf2d25416 100644 (file)
--- a/tests/data/test2042
+++ b/tests/data/test2042
@@ -22,10 +22,10 @@ SSLpinning
 <server>
 https Server-localhost-sv.pem
 </server>
- <name>
+<name>
 HTTPS wrong base64-sha256 pinnedpubkey but right CN
- </name>
- <command>
+</name>
+<command>
 --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey sha256//bSIggTf+ikMG0CtmDlpMVBd7yi7H1md4URogRPqerso= https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name

diff --git a/tests/data/test2043 b/tests/data/test2043
index 754a9b92ea3088a089642342a6821e89664d4cc5..eb4387667f9525ea7645ac30e191d55626d246b7 100644 (file)
--- a/tests/data/test2043
+++ b/tests/data/test2043
@@ -15,10 +15,10 @@ Schannel
 <server>
 none
 </server>
- <name>
+<name>
 Disable certificate revocation checks
- </name>
- <command>
+</name>
+<command>
 --ssl-no-revoke -I https://revoked.badssl.com/
 </command>
 </client>

diff --git a/tests/data/test2046 b/tests/data/test2046
index 3882eb2db2e340169c8ace79f9f70f010f6dffdb..fc5ddca84eba44df55a7925c110b83843d59ecb7 100644 (file)
--- a/tests/data/test2046
+++ b/tests/data/test2046
@@ -48,11 +48,11 @@ LC_CTYPE=en_US.UTF-8
 <precheck>
 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
 </precheck>
- <name>
+<name>
 Connection reuse with IDN host name
- </name>
+</name>
 
- <command>
+<command>
 http://åäö.se:%HTTPPORT/%TESTNUMBER --resolve xn--4cab6c.se:%HTTPPORT:%HOSTIP -w "%{num_connects}\n%{num_redirects}\n%{size_download}\n%{url_effective}\n%{content_type}\n%{response_code}\n" -L
 </command>
 </client>

diff --git a/tests/data/test2047 b/tests/data/test2047
index e0e953189acdcab4b83728478c5e5c0c1f81f8e0..76bed3cc9da67d1407564b2399a8d7e3c2d75467 100644 (file)
--- a/tests/data/test2047
+++ b/tests/data/test2047
@@ -49,11 +49,11 @@ LC_CTYPE=en_US.UTF-8
 <precheck>
 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
 </precheck>
- <name>
+<name>
 Connection reuse with IDN host name over HTTP proxy
- </name>
+</name>
 
- <command>
+<command>
 http://åäö.se/%TESTNUMBER -x %HOSTIP:%HTTPPORT -w "%{num_connects}\n%{num_redirects}\n%{size_download}\n%{url_effective}\n%{content_type}\n%{response_code}\n" -L
 </command>
 </client>

diff --git a/tests/data/test2049 b/tests/data/test2049
index 2b0c64508d55f6d8bb4ea6822f0ddff51ab86e03..98be38bee670701e5a58f38c0d4b8f8a2c688c9b 100644 (file)
--- a/tests/data/test2049
+++ b/tests/data/test2049
@@ -26,11 +26,11 @@ OK
 <server>
 http
 </server>
- <name>
+<name>
 Connect to specific host
- </name>
+</name>
 
- <command>
+<command>
 http://www1.example.com:8081/%TESTNUMBER --connect-to ::%HOSTIP:%HTTPPORT --next http://www2.example.com:8082/%TESTNUMBER --connect-to :8082:%HOSTIP:%HTTPPORT --next http://www3.example.com:8083/%TESTNUMBER --connect-to www3.example.com::%HOSTIP:%HTTPPORT --next http://www4.example.com:8084/%TESTNUMBER --connect-to www4.example.com:8084:%HOSTIP:%HTTPPORT
 </command>
 </client>

diff --git a/tests/data/test205 b/tests/data/test205
index e2165ccd10b74d2dc54b4b30b613ae3a8a5aae70..8239f63222f0ece8e9c84d396164632cb1c796f5 100644 (file)
--- a/tests/data/test205
+++ b/tests/data/test205
@@ -13,9 +13,9 @@ FAILURE
 <server>
 file
 </server>
- <name>
+<name>
 "upload" with file://
- </name>
+</name>
 <command option="no-include">
 file://localhost/%PWD/%LOGDIR/nonexisting/result%TESTNUMBER.txt -T %LOGDIR/upload%TESTNUMBER.txt
 </command>

diff --git a/tests/data/test2050 b/tests/data/test2050
index 8d63a8d4b15f2ff9648d02c117fa76e064f1c5a9..3363fe55f929c3cc1a560c123b9694559113e8c0 100644 (file)
--- a/tests/data/test2050
+++ b/tests/data/test2050
@@ -46,11 +46,11 @@ OK
 http
 http-proxy
 </server>
- <name>
+<name>
 Connect to specific host via HTTP proxy (switch to tunnel mode automatically)
- </name>
+</name>
 
- <command>
+<command>
 http://www.example.com.%TESTNUMBER/%TESTNUMBER --connect-to ::connect.example.com.%TESTNUMBER:%HTTPPORT -x %HOSTIP:%PROXYPORT
 </command>
 <features>

diff --git a/tests/data/test2051 b/tests/data/test2051
index 2dcee0da1a64e5c5f3f45c1135edd6495c2cc29f..ce76cc93c059d6b4bfa167ff6303bb173d100f09 100644 (file)
--- a/tests/data/test2051
+++ b/tests/data/test2051
@@ -26,11 +26,11 @@ OK
 <server>
 http
 </server>
- <name>
+<name>
 Connect to specific host: Reuse existing connections if possible
- </name>
+</name>
 
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n" --next --connect-to ::%HOSTIP:%HTTPPORT http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n" --next http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n"
 </command>
 </client>

diff --git a/tests/data/test2052 b/tests/data/test2052
index dd04f3260775df2266cc1e435685e7eb8e688236..a2a73e8ad35fb3e9a05f49daec76d18d2aa20040 100644 (file)
--- a/tests/data/test2052
+++ b/tests/data/test2052
@@ -27,11 +27,11 @@ OK
 <server>
 http
 </server>
- <name>
+<name>
 Connect to specific host: Do not mix connections with and without a "connect to host"
- </name>
+</name>
 
- <command>
+<command>
 http://www.example.com:%HTTPPORT/%TESTNUMBER --resolve www.example.com:%HTTPPORT:%HOSTIP -w "%{num_connects}\n" --next --resolve -www.example.com:%HTTPPORT --connect-to ::%HOSTIP:%HTTPPORT http://www.example.com:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n"
 </command>
 </client>

diff --git a/tests/data/test2053 b/tests/data/test2053
index 41035eb5948e44c3af67ca08b3c9e4fbe8035020..a416d528689c43ddfe15378c46673beacebe6178 100644 (file)
--- a/tests/data/test2053
+++ b/tests/data/test2053
@@ -26,11 +26,11 @@ OK
 <server>
 http
 </server>
- <name>
+<name>
 Connect to specific host with IP addresses
- </name>
+</name>
 
- <command>
+<command>
 http://10.0.0.1:8081/%TESTNUMBER --connect-to 10.0.0.1:8081:%HOSTIP:%HTTPPORT --next http://[fc00::1]:8082/%TESTNUMBER --connect-to [fc00::1]:8082:%HOSTIP:%HTTPPORT
 </command>
 </client>

diff --git a/tests/data/test2054 b/tests/data/test2054
index 022d13229854ccaf3bca56a735ff81506d67233d..8217444e5364e7c0b45e0c0ee4da62ca41b38aa4 100644 (file)
--- a/tests/data/test2054
+++ b/tests/data/test2054
@@ -26,11 +26,11 @@ OK
 <server>
 http
 </server>
- <name>
+<name>
 Connect to specific host: use the first "connect-to" string that matches
- </name>
+</name>
 
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --connect-to foo::bar: --connect-to :123::456 --next http://www.example.com:%HTTPPORT/%TESTNUMBER --connect-to www.example.com::%HOSTIP: --connect-to www.example.com::foo: --next http://%HOSTIP:8083/%TESTNUMBER --connect-to :8083::%HTTPPORT --connect-to :8083::123 --next http://www.example.com:8084/%TESTNUMBER --connect-to www.example.com:8084:%HOSTIP:%HTTPPORT --connect-to www.example.com:8084:foo:123
 </command>
 </client>

diff --git a/tests/data/test2055 b/tests/data/test2055
index 2c62b259b1738bb070bfc6a3379f463bd16d5964..66ddb084f199b2f96af643f77730e142727e947e 100644 (file)
--- a/tests/data/test2055
+++ b/tests/data/test2055
@@ -48,13 +48,13 @@ http
 http-proxy
 socks5
 </server>
- <name>
+<name>
 Connect to specific host via SOCKS proxy and HTTP proxy (switch to tunnel mode automatically)
- </name>
+</name>
 <features>
 proxy
 </features>
- <command>
+<command>
 http://www.example.com.%TESTNUMBER/%TESTNUMBER --connect-to ::connect.example.com.%TESTNUMBER:%HTTPPORT -x %HOSTIP:%PROXYPORT --preproxy socks5://%HOSTIP:%SOCKSPORT
 </command>
 </client>

diff --git a/tests/data/test2058 b/tests/data/test2058
index 7561c28fc4aae7a003d595dc51323719f5d197a6..4dfac74b7dc30e47376e57f64be00d52d4496288 100644 (file)
--- a/tests/data/test2058
+++ b/tests/data/test2058
@@ -68,10 +68,10 @@ http
 crypto
 proxy
 </features>
- <name>
+<name>
 HTTP POST --digest with PUT, resumed upload, modified method and SHA-256
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -T %LOGDIR/%TESTNUMBER -x  http://%HOSTIP:%HTTPPORT -C 2 -X GET
 </command>
 <file name="%LOGDIR/%TESTNUMBER">

diff --git a/tests/data/test2059 b/tests/data/test2059
index 0bd5be8c9707be854d484fcf3888363b206824ce..e2957bce5daad06d810d6acb40ebb28a31aa7213 100644 (file)
--- a/tests/data/test2059
+++ b/tests/data/test2059
@@ -68,10 +68,10 @@ http
 crypto
 proxy
 </features>
- <name>
+<name>
 HTTP POST --digest with PUT, resumed upload, modified method, SHA-256 and userhash=true
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -T %LOGDIR/%TESTNUMBER -x  http://%HOSTIP:%HTTPPORT -C 2 -X GET
 </command>
 <file name="%LOGDIR/%TESTNUMBER">

diff --git a/tests/data/test206 b/tests/data/test206
index f92ff835731db7ad953aeda0f4de624297f19ad0..19fbbfb4a50b654a0fd026bf63fd8226137d99df 100644 (file)
--- a/tests/data/test206
+++ b/tests/data/test206
@@ -75,10 +75,10 @@ http
 crypto
 proxy
 </features>
- <name>
+<name>
 HTTP proxy CONNECT auth Digest
- </name>
- <command>
+</name>
+<command>
 http://test.remote.haxx.se.%TESTNUMBER:8990/path/%TESTNUMBER0002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
 </command>
 </client>

diff --git a/tests/data/test2060 b/tests/data/test2060
index 85637157be9c0f4de23076bad08930ea89bdd039..dc4223ec618c8dedfc862bf7d638062cd57526d0 100644 (file)
--- a/tests/data/test2060
+++ b/tests/data/test2060
@@ -68,10 +68,10 @@ http
 crypto
 proxy
 </features>
- <name>
+<name>
 HTTP POST --digest with PUT, resumed upload, modified method, SHA-512-256 and userhash=false
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -T %LOGDIR/%TESTNUMBER -x  http://%HOSTIP:%HTTPPORT -C 2 -X GET
 </command>
 <file name="%LOGDIR/%TESTNUMBER">

diff --git a/tests/data/test2061 b/tests/data/test2061
index 702bc64dd9270a77b2a4f8463fceb96b8ee3b9f6..d232f6251f7fcc4460e51b529364b13746ca9cf2 100644 (file)
--- a/tests/data/test2061
+++ b/tests/data/test2061
@@ -55,10 +55,10 @@ http
 !SSPI
 crypto
 </features>
- <name>
+<name>
 HTTP with RFC7616 SHA256 Digest authorization
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
 </command>
 </client>

diff --git a/tests/data/test2062 b/tests/data/test2062
index e05a42f66fc7ad9584554b6eb3e55fef68a572d8..b6a1e01f9344ed248e6a4c814462fca153b423ee 100644 (file)
--- a/tests/data/test2062
+++ b/tests/data/test2062
@@ -55,10 +55,10 @@ http
 !SSPI
 crypto
 </features>
- <name>
+<name>
 HTTP with RFC7616 SHA-512-256 Digest authorization and userhash=false
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
 </command>
 </client>

diff --git a/tests/data/test2063 b/tests/data/test2063
index 986a6ef6ab96f5dafc1c081426e6edcee28a997d..f769428a9539a449a99a183cf3700dcd6aacdb51 100644 (file)
--- a/tests/data/test2063
+++ b/tests/data/test2063
@@ -55,10 +55,10 @@ http
 !SSPI
 crypto
 </features>
- <name>
+<name>
 HTTP with RFC7616 SHA-256 Digest authorization and userhash=true
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
 </command>
 </client>

diff --git a/tests/data/test2064 b/tests/data/test2064
index 77810ec1dd861e750c79bb83ef971b4be567f5eb..6d6fb14ace79adbf7c5bda2a9a43315ff1a83120 100644 (file)
--- a/tests/data/test2064
+++ b/tests/data/test2064
@@ -55,10 +55,10 @@ http
 !SSPI
 crypto
 </features>
- <name>
+<name>
 HTTP with RFC7616 Digest authorization with bad password and SHA256
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:test2pass --digest
 </command>
 </client>

diff --git a/tests/data/test2065 b/tests/data/test2065
index 3d7afea2509f8def51ea5bb04b405da7b6c850a3..0b794302df6aedc1b72f8527c8a086bd4d63fd75 100644 (file)
--- a/tests/data/test2065
+++ b/tests/data/test2065
@@ -55,10 +55,10 @@ http
 !SSPI
 crypto
 </features>
- <name>
+<name>
 HTTP with RFC7616 Digest authorization with bad password, SHA-512-256 and userhash=false
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:test2pass --digest
 </command>
 </client>

diff --git a/tests/data/test2066 b/tests/data/test2066
index 4352afaf35e5fcccce9ac2439df3eeeb57b6c2dc..999f55ae4b43d12aafb9a12d98ab536b39fde248 100644 (file)
--- a/tests/data/test2066
+++ b/tests/data/test2066
@@ -55,10 +55,10 @@ http
 !SSPI
 crypto
 </features>
- <name>
+<name>
 HTTP with RFC7616 Digest authorization with bad password, SHA-256 and userhash=true
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:test2pass --digest
 </command>
 </client>

diff --git a/tests/data/test207 b/tests/data/test207
index 3719201eeef1e22c05ee66a81c23af2fd34eeee9..0c9bcaeb67838dffb49e317f6369d8ec44440bc7 100644 (file)
--- a/tests/data/test207
+++ b/tests/data/test207
@@ -37,10 +37,10 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with chunked Transfer-Encoding closed prematurely
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test2070 b/tests/data/test2070
index 74cdd7d8c43ad9f8ec25c9e480a8fcd0c183bd55..38b6ca89d0b0bc36b0ad5ed14d9ac643d7d738fd 100644 (file)
--- a/tests/data/test2070
+++ b/tests/data/test2070
@@ -30,14 +30,14 @@ Schannel
 <server>
 https Server-localhost-sv.pem
 </server>
- <name>
+<name>
 Ignore certificate revocation "best effort" strategy
- </name>
+</name>
   <setenv>
 # This test is pointless if we're not using the schannel backend
 CURL_SSL_BACKEND=schannel
  </setenv>
- <command>
+<command>
 --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --ssl-revoke-best-effort https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name

diff --git a/tests/data/test2071 b/tests/data/test2071
index 45ee91737d5be7a2ab13894835df87e54bf24a49..544893af572ad79e23fff88ec9cae40b7f1283eb 100644 (file)
--- a/tests/data/test2071
+++ b/tests/data/test2071
@@ -20,9 +20,9 @@ moo
 <server>
 file
 </server>
- <name>
+<name>
 basic file:// file with "127.0.0.1" hostname
- </name>
+</name>
 <command option="no-include">
 file://127.0.0.1%FILE_PWD/%LOGDIR/test2070.txt
 </command>

diff --git a/tests/data/test2073 b/tests/data/test2073
index a8be75e7cd2adaefbc0ea55e497952ed73c6687e..8eea2655368f78df94fca6381aaefa6b6b094759 100644 (file)
--- a/tests/data/test2073
+++ b/tests/data/test2073
@@ -33,10 +33,10 @@ Mime
 <server>
 http
 </server>
- <name>
+<name>
 HTTP form posts with handle reset
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -F 'name=a;filename=a.pdf' --next http://%HOSTIP:%HTTPPORT/%TESTNUMBER -F 'name=b;filename=b.jpg'
 </command>
 </client>

diff --git a/tests/data/test2074 b/tests/data/test2074
index e7b600338178422c214193b40f719f86319a6053..1ef3480b5c2524b966ca2a87b36925d6dca95c84 100644 (file)
--- a/tests/data/test2074
+++ b/tests/data/test2074
@@ -32,10 +32,10 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
 </client>

diff --git a/tests/data/test2079 b/tests/data/test2079
index 67ffa1656ca1822899fe64026a3242ace861a909..0164d1b3b32627e29553b70d0452090a006518c3 100644 (file)
--- a/tests/data/test2079
+++ b/tests/data/test2079
@@ -31,14 +31,14 @@ Schannel
 <server>
 https Server-localhost-sv.pem
 </server>
- <name>
+<name>
 simple HTTPS GET with PEM public key pinning (Schannel variant)
- </name>
+</name>
  <setenv>
 # This test is pointless if we're not using the schannel backend
 CURL_SSL_BACKEND=schannel
  </setenv>
- <command>
+<command>
 --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey %SRCDIR/certs/Server-localhost-sv.pub.pem --ssl-revoke-best-effort https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name

diff --git a/tests/data/test208 b/tests/data/test208
index f3ad620ee9fd61a0fb195b1ce75750a3451d764b..d2b3e159906c5a625aa583949ffa9f997633f1d8 100644 (file)
--- a/tests/data/test208
+++ b/tests/data/test208
@@ -29,10 +29,10 @@ http
 ftp
 proxy
 </features>
- <name>
+<name>
 HTTP PUT to a FTP URL with username+password - over HTTP proxy
- </name>
- <command>
+</name>
+<command>
 -x http://%HOSTIP:%HTTPPORT ftp://daniel:mysecret@host.com/we/want/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt
 </command>
 <file name="%LOGDIR/test%TESTNUMBER.txt">

diff --git a/tests/data/test2080 b/tests/data/test2080
index 8b92c4f13a58f7302b936c65422433253918b38d..7f08385b6f3e4626a0346347861893bfa2d8de14 100644 (file)
Binary files a/tests/data/test2080 and b/tests/data/test2080 differ

diff --git a/tests/data/test2081 b/tests/data/test2081
index add9292522007c2b51d26cae65423b6a932b5e7a..0a95fb88132c0fea4709eef60ba485d146c7be0c 100644 (file)
--- a/tests/data/test2081
+++ b/tests/data/test2081
@@ -32,10 +32,10 @@ Thanks for following.
 <server>
 http
 </server>
- <name>
+<name>
 Automatic referrer credential and anchor stripping check
- </name>
- <command>
+</name>
+<command>
 http://user:pass@%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER#anchor --location --referer ';auto' --write-out '%{referer}\n'
 </command>
 </client>

diff --git a/tests/data/test2087 b/tests/data/test2087
index e0fa9ed1c0dbcf23ff9708359cc4128a5daecdbb..eb8d3bad89343ccc3ea6325c5c77a6e165349341 100644 (file)
--- a/tests/data/test2087
+++ b/tests/data/test2087
@@ -31,14 +31,14 @@ Schannel
 <server>
 https Server-localhost-sv.pem
 </server>
- <name>
+<name>
 simple HTTPS GET with base64-sha256 public key pinning (Schannel variant)
- </name>
+</name>
  <setenv>
 # This test is pointless if we're not using the schannel backend
 CURL_SSL_BACKEND=schannel
  </setenv>
- <command>
+<command>
 --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey sha256//AAUDLk4c98xcFUDvA9i/MnA9HuO03IPi15r+Cx9OXnc= --ssl-revoke-best-effort https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name

diff --git a/tests/data/test21 b/tests/data/test21
index 5c099cf34e9de86b81933c0f019653d4a3962bde..d98830e1d2e145d52e50ddbc34d7e8cb4774a754 100644 (file)
--- a/tests/data/test21
+++ b/tests/data/test21
@@ -19,10 +19,10 @@ Mime
 <server>
 http
 </server>
- <name>
+<name>
 use curl with multiple request methods
- </name>
- <command>
+</name>
+<command>
 -I -d FOOO -F moo=moo localhost
 </command>
 </client>

diff --git a/tests/data/test210 b/tests/data/test210
index 170316425b0f5aec6ad6a75cff2fb25072ed4d64..1ee313d76ac947e5c68dc7a10dd9407dfa15613c 100644 (file)
--- a/tests/data/test210
+++ b/tests/data/test210
@@ -19,9 +19,9 @@ data blobb
 <server>
 ftp
 </server>
- <name>
+<name>
 Get two FTP files from the same remote dir: no second CWD
- </name>
+</name>
 <command option="no-include">
 ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER
 </command>

diff --git a/tests/data/test2100 b/tests/data/test2100
index 1fa0f23bf28a02e94082f40f0086104097fe184e..120a6af7af3a09c06ef218593d1d1e28ba840296 100644 (file)
--- a/tests/data/test2100
+++ b/tests/data/test2100
@@ -51,10 +51,10 @@ debug
 DoH
 ipv6
 </features>
- <name>
+<name>
 HTTP GET using DoH
- </name>
- <command>
+</name>
+<command>
 http://foo.example.com:%HTTPPORT/%TESTNUMBER --doh-url http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001
 </command>
 </client>

diff --git a/tests/data/test211 b/tests/data/test211
index 0fe6e6f96ed609c7a0e1c9f7e652ec941c876c37..6830727ab6fb35790286457b90f9372a81739410 100644 (file)
--- a/tests/data/test211
+++ b/tests/data/test211
@@ -20,10 +20,10 @@ REPLY EPSV 500 no such command
 <server>
 ftp
 </server>
- <name>
+<name>
 Get two FTP files with no remote EPSV support
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER
 </command>
 <stdout>

diff --git a/tests/data/test212 b/tests/data/test212
index 175759a86537dd7f936bf3fc3c773fe35df72315..db0201e1571b2d846cd4ba707ec9d47f2216bc68 100644 (file)
--- a/tests/data/test212
+++ b/tests/data/test212
@@ -25,10 +25,10 @@ ftp
 <features>
 ipv6
 </features>
- <name>
+<name>
 Get two FTP files with no remote EPRT support
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER -P -
 </command>
 <stdout>

diff --git a/tests/data/test214 b/tests/data/test214
index bb3390f611be337fa19857e9eed20dd3f4721684..846b46458e58cf612f8c6d8af7c4062e720aa3e5 100644 (file)
--- a/tests/data/test214
+++ b/tests/data/test214
@@ -25,9 +25,9 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 HTTP URL with escaped { and }
- </name>
+</name>
 <command>
 "http://%HOSTIP:%HTTPPORT/\{\}\/%TESTNUMBER"
 </command>

diff --git a/tests/data/test215 b/tests/data/test215
index 5fd8fc656b687d51955a86147d46199981398d79..cead9c742d11bb2fd840f7a3ee8b3549f00c1f76 100644 (file)
--- a/tests/data/test215
+++ b/tests/data/test215
@@ -30,10 +30,10 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 <server>
 ftp
 </server>
- <name>
+<name>
 Get two FTP dir listings from the same remote dir: no second CWD
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER/ ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER/
 </command>
 </client>

diff --git a/tests/data/test216 b/tests/data/test216
index 82629f5915a72f119684ca4fb6b8d611bbe5e962..1be87c0d1ea409f3313d9895ac5905bb8a8ceab5 100644 (file)
--- a/tests/data/test216
+++ b/tests/data/test216
@@ -14,10 +14,10 @@ FTP
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP upload two files to the same dir
- </name>
- <command>
+</name>
+<command>
 -T %LOGDIR/upload.%TESTNUMBER ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER/ -T %LOGDIR/upload.%TESTNUMBER ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER/%2e%2eanotherup.%TESTNUMBER
 </command>
 <file name="%LOGDIR/upload.%TESTNUMBER">

diff --git a/tests/data/test217 b/tests/data/test217
index d791416b03da837ae5e3427b1b3394fd85bf9f71..cb6c6738b6e2fe6edbc9337ddd64fa526495aea2 100644 (file)
--- a/tests/data/test217
+++ b/tests/data/test217
@@ -28,10 +28,10 @@ And you should ignore this data.
 <server>
 http
 </server>
- <name>
+<name>
 HTTP proxy CONNECT to proxy returning 405
- </name>
- <command>
+</name>
+<command>
 http://test.remote.example.com.%TESTNUMBER:%HTTPPORT/path/%TESTNUMBER0002 --proxy http://%HOSTIP:%HTTPPORT --proxytunnel -w "%{http_code} %{http_connect}\n"
 </command>
 <features>

diff --git a/tests/data/test218 b/tests/data/test218
index 3b67095bf0aa8fccd7f9dfcd4af6119f0f1e3b96..cf9c41ad49d74029e9de9b0073bbbcd870447ae1 100644 (file)
--- a/tests/data/test218
+++ b/tests/data/test218
@@ -25,10 +25,10 @@ blaha
 <server>
 http
 </server>
- <name>
+<name>
 HTTP PUT from a file but enforce chunked transfer-encoding
- </name>
- <command>
+</name>
+<command>
  -T %LOGDIR/file%TESTNUMBER -H "Transfer-Encoding: chunked" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 <file name="%LOGDIR/file%TESTNUMBER">

diff --git a/tests/data/test219 b/tests/data/test219
index 74a8551dae204691f871fdd9d91e9ada91e431bc..2e965f366e9f092121e20510d4a929884aa50d62 100644 (file)
--- a/tests/data/test219
+++ b/tests/data/test219
@@ -20,10 +20,10 @@ none
 http
 proxy
 </features>
- <name>
+<name>
 try using proxy with unsupported scheme
- </name>
- <command>
+</name>
+<command>
 -x foo://%HOSTIP:%NOLISTENPORT/%TESTNUMBER http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test22 b/tests/data/test22
index 92fded6df1b2cd1823b7876d809787de162cb584..b594a9cf74c296028db7ba12790e38948d62c3a7 100644 (file)
--- a/tests/data/test22
+++ b/tests/data/test22
@@ -21,10 +21,10 @@ This is the proof it works
 <server>
 http
 </server>
- <name>
+<name>
 get HTTP with URL > 10000 bytes
- </name>
- <command>
+</name>
+<command>
 %HOSTIP:%HTTPPORT/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test220 b/tests/data/test220
index 844bb02393b37e1ecb49b832b5af3f18460027c9..8b28ec0a3d1e35b288d2ea077e906af60cc66668 100644 (file)
--- a/tests/data/test220
+++ b/tests/data/test220
@@ -43,10 +43,10 @@ libz
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET gzip compressed content
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>

diff --git a/tests/data/test221 b/tests/data/test221
index 2d769bcc76b8638440311fe59e04cda63220c7a3..79731628c3ab9ba411203cf21999656a0fdf3d08 100644 (file)
--- a/tests/data/test221
+++ b/tests/data/test221
@@ -43,10 +43,10 @@ libz
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET gzip compressed content with broken gzip header
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>

diff --git a/tests/data/test222 b/tests/data/test222
index 3f6e7c97f76a40f7b58e63b5e667a82b9ff80189..d5744ea80f10f1aad1f2918dd6cd7b2b2e4b4f79 100644 (file)
--- a/tests/data/test222
+++ b/tests/data/test222
@@ -174,10 +174,10 @@ libz
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET deflate compressed content
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>

diff --git a/tests/data/test223 b/tests/data/test223
index 4d0dddc11545eaaaf8ca36577b54db377995df03..3a2cf04054a91786ebc62bbbf291643c3fc2c66a 100644 (file)
--- a/tests/data/test223
+++ b/tests/data/test223
@@ -64,10 +64,10 @@ libz
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET deflate compressed content with broken deflate header
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>

diff --git a/tests/data/test224 b/tests/data/test224
index 4fc84207c491a7986eb6df6d209392357d896e4e..0b654c2e8c2a83d73e231b349764bb2c87850815 100644 (file)
--- a/tests/data/test224
+++ b/tests/data/test224
@@ -79,10 +79,10 @@ libz
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET gzip compressed content with huge comment and extra field
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>

diff --git a/tests/data/test225 b/tests/data/test225
index 5c8efd9d93bb5a68928c1fb3ec7cb269ea91947b..36fb2ef8ca5cb13f0d12ba15827af5b13df6c17e 100644 (file)
--- a/tests/data/test225
+++ b/tests/data/test225
@@ -10,10 +10,10 @@ FAILURE
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP %0a-code in URL's name part
- </name>
- <command>
+</name>
+<command>
 ftp://bad%0auser:passwd@%HOSTIP:%FTPPORT/%TESTNUMBER%0a
 </command>
 </client>

diff --git a/tests/data/test226 b/tests/data/test226
index 93954576640df1521838a2f941c590ddc4aaf843..df0c4ac6f48c49779f7ff8d01dab94b8927de3a3 100644 (file)
--- a/tests/data/test226
+++ b/tests/data/test226
@@ -11,10 +11,10 @@ FAILURE
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP %0d-code in URL's CWD part
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER%0d
 </command>
 </client>

diff --git a/tests/data/test227 b/tests/data/test227
index 18622df58978b24ce3dedff8249e481e1d84d9af..f7b445185d7d51a9427f6d0fa8337fcc74735798 100644 (file)
--- a/tests/data/test227
+++ b/tests/data/test227
@@ -27,10 +27,10 @@ REPLY FAIL 500 this might not be a failure!
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP with quote ops
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "NOOP 1" -Q "+NOOP 2" -Q "-NOOP 3" -Q "*FAIL" -Q "+*FAIL HARD"
 </command>
 </client>

diff --git a/tests/data/test228 b/tests/data/test228
index 7ac4ca49a3cae2b6d52a90a1ad356fc56381ac23..8e7d73ff0c98d41450ad22d82fd9bf8afa9cc697 100644 (file)
--- a/tests/data/test228
+++ b/tests/data/test228
@@ -26,10 +26,10 @@ REPLY ACCT 230 thank you
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP RETR with ACCT
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-account "one count"
 </command>
 </client>

diff --git a/tests/data/test229 b/tests/data/test229
index 75dc10335eb0dcf4be92881dc765a2ed77ab49cd..71da135fc0e955166b2ae9a489466a862a7ce1b6 100644 (file)
--- a/tests/data/test229
+++ b/tests/data/test229
@@ -19,10 +19,10 @@ REPLY ACCT 532 bluah!
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP RETR with bad ACCT
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-account "one count"
 </command>
 </client>

diff --git a/tests/data/test23 b/tests/data/test23
index 46872e82ea6b71b19ad5cacf176a17421f78530a..1f15b218e1a7ee868d0998cefa05cbc8e6900d27 100644 (file)
--- a/tests/data/test23
+++ b/tests/data/test23
@@ -16,10 +16,10 @@ FAILURE
 <server>
 http
 </server>
- <name>
+<name>
 unsupported protocol:// URL
- </name>
- <command>
+</name>
+<command>
 htfp://%HOSTIP:%HTTPPORT/none.htfml
 </command>
 </client>

diff --git a/tests/data/test230 b/tests/data/test230
index a8c04be682e2b14fb03ac58bcc370d4fc47716e7..32b28e5b51b06eaf09c4107547751d2defc3308b 100644 (file)
--- a/tests/data/test230
+++ b/tests/data/test230
@@ -175,10 +175,10 @@ libz
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET multiply compressed content
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>

diff --git a/tests/data/test2300 b/tests/data/test2300
index 997acfad29e727fc35b8a4c4e69c9cfe3bad9d2a..fa620a1b1ac3aec6c204f7a1c5d2bb062edaa83a 100644 (file)
--- a/tests/data/test2300
+++ b/tests/data/test2300
@@ -33,10 +33,10 @@ ws
 <server>
 http
 </server>
- <name>
+<name>
 WebSockets upgrade only
- </name>
- <command>
+</name>
+<command>
 ws://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test2306 b/tests/data/test2306
index e222dcc77a9315187ebbcdedba70b79043b72975..620f7b5ecc1200a42892cd3e2d7b495a9e88fbde 100644 (file)
--- a/tests/data/test2306
+++ b/tests/data/test2306
@@ -43,10 +43,10 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 HTTP GET reused handle with first header folded
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002
 </command>
 </client>

diff --git a/tests/data/test231 b/tests/data/test231
index 64bafa1763a729364fde3385078e62a4db689fd0..e89346614eacb3c8f55e4050e6a06b03ab1c201f 100644 (file)
--- a/tests/data/test231
+++ b/tests/data/test231
@@ -19,9 +19,9 @@ C01234567
 <server>
 file
 </server>
- <name>
+<name>
 file:// with resume
- </name>
+</name>
 <command option="no-include">
 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt -C 10
 </command>

diff --git a/tests/data/test232 b/tests/data/test232
index 32fdc6a350c2dedd6b28e584660a70a66f6ebb68..025ce9f62ee8db824b6a1fdab69f1f1d1606d68a 100644 (file)
--- a/tests/data/test232
+++ b/tests/data/test232
@@ -174,10 +174,10 @@ libz
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET deflate raw-compressed content
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>

diff --git a/tests/data/test233 b/tests/data/test233
index d0899758629de422270c9b5e48cfcde2f5502d37..e02be2a86ec541ea53b3c8c4629e82e8eecc2653 100644 (file)
--- a/tests/data/test233
+++ b/tests/data/test233
@@ -61,10 +61,10 @@ contents
 <server>
 http
 </server>
- <name>
+<name>
 HTTP, proxy, site+proxy auth and Location: to new host
- </name>
- <command>
+</name>
+<command>
 http://first.host.it.is/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT --user iam:myself --proxy-user testing:this --location
 </command>
 <features>

diff --git a/tests/data/test234 b/tests/data/test234
index 5e9258f5090767e6a7b0da97c21548f5820ffe97..f37d492b567333bd8fc06fb602c7fd5022138aec 100644 (file)
--- a/tests/data/test234
+++ b/tests/data/test234
@@ -63,10 +63,10 @@ contents
 <server>
 http
 </server>
- <name>
+<name>
 HTTP, proxy, site+proxy auth and Location: to new host using location-trusted
- </name>
- <command>
+</name>
+<command>
 http://first.host.it.is/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT --user iam:myself --proxy-user testing:this --location-trusted
 </command>
 <features>

diff --git a/tests/data/test235 b/tests/data/test235
index 3ff27cf2611c5e56d51d35c22e512232faa4fd4f..4bfe7497ea6886bc07bd23c58c6681fa3b607a7a 100644 (file)
--- a/tests/data/test235
+++ b/tests/data/test235
@@ -17,10 +17,10 @@ REPLY SIZE 500 command not understood
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP resumed upload but no file present remotely
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -C -
 </command>
 <file name="%LOGDIR/upload%TESTNUMBER">

diff --git a/tests/data/test236 b/tests/data/test236
index 6f59e643e3bfd5029bb02db7ad157685beebe7f5..a66fa046d93e7527c105897082c51d4c32496e43 100644 (file)
--- a/tests/data/test236
+++ b/tests/data/test236
@@ -20,10 +20,10 @@ REPLY SIZE 500 command not understood
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP resume upload but denied access to remote file
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/file%TESTNUMBER.txt -C -
 </command>
 <file name="%LOGDIR/file%TESTNUMBER.txt">

diff --git a/tests/data/test237 b/tests/data/test237
index 18ee6d951e731fcec907a597e4b80b14f7474014..9e68651189f219eafc9af312189af992b8efdce2 100644 (file)
--- a/tests/data/test237
+++ b/tests/data/test237
@@ -17,10 +17,10 @@ REPLY PASV 227 Entering Passiv Mode (1216,256,2,127,127,127)
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP getting bad host in 227-response to PASV
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --disable-epsv
 </command>
 </client>

diff --git a/tests/data/test238 b/tests/data/test238
index 748ad46bfd2f01eced214fff594b19c4aaa57b68..3c0db0441383aa661f3055c657bf1163209b0a05 100644 (file)
--- a/tests/data/test238
+++ b/tests/data/test238
@@ -17,10 +17,10 @@ REPLY EPSV 229 Entering Passiv Mode (|||1000000|)
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP getting bad port in response to EPSV
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test24 b/tests/data/test24
index c275bfd0120cc0f621ad5796c652baa28b607e3e..888c635733149df305c67054b35a41e2c954db68 100644 (file)
--- a/tests/data/test24
+++ b/tests/data/test24
@@ -21,10 +21,10 @@ This silly page doesn't reaaaaaly exist so you should not get it.
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET fail silently on HTTP error return
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --fail --silent --show-error
 </command>
 </client>

diff --git a/tests/data/test240 b/tests/data/test240
index 068a2eb60d6c957fcb50faa41826636c2d6f24f6..d033ae35ceb04f49c8e2993f3b46511f78486eba 100644 (file)
--- a/tests/data/test240
+++ b/tests/data/test240
@@ -34,10 +34,10 @@ ipv6
 <server>
 http-ipv6
 </server>
- <name>
+<name>
 HTTP-IPv6 GET
- </name>
- <command>
+</name>
+<command>
 -g "http://%HOST6IP:%HTTP6PORT/%TESTNUMBER"
 </command>
 </client>

diff --git a/tests/data/test2400 b/tests/data/test2400
index 7f28f2f48cf199a1a5dc2d70c19c77a8ac42019d..e920f4f164339de17ff72557efd0481d6850701e 100644 (file)
--- a/tests/data/test2400
+++ b/tests/data/test2400
@@ -35,12 +35,12 @@ SSL
 http
 http/2
 </server>
- <name>
+<name>
 HTTP/2 GET
- </name>
+</name>
 <setenv>
 </setenv>
- <command>
+<command>
 -k --http2 "https://%HOSTIP:%HTTP2TLSPORT/%TESTNUMBER"
 </command>
 

diff --git a/tests/data/test2401 b/tests/data/test2401
index 667974e8663a788b71f8805900bf0a095a5d0b10..ef5fbb1818336e7ea7cb4e28683208de1f7d0a56 100644 (file)
--- a/tests/data/test2401
+++ b/tests/data/test2401
@@ -33,12 +33,12 @@ SSL
 http
 http/2
 </server>
- <name>
+<name>
 HTTP/2 GET
- </name>
+</name>
 <setenv>
 </setenv>
- <command>
+<command>
 -k --http2 "https://%HOSTIP:%HTTP2TLSPORT/%TESTNUMBER" -d "moo"
 </command>
 

diff --git a/tests/data/test2402 b/tests/data/test2402
index 57a26b970bcf5901c49abaf75c5f03e8b971a763..44d48f85f2d2d59ba1aa8f3b9fbca9d9af3acaf3 100644 (file)
--- a/tests/data/test2402
+++ b/tests/data/test2402
@@ -57,10 +57,10 @@ http/2
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 HTTP GET multiple over HTTP/2
- </name>
- <command>
+</name>
+<command>
 https://%HOSTIP:%HTTP2TLSPORT/path/%TESTNUMBER %HOSTIP %HTTP2TLSPORT
 </command>
 </client>

diff --git a/tests/data/test2403 b/tests/data/test2403
index 11aa74b59b23d627a6fb577087acf9f898865e70..7a993d731b8a21e7bc127225cbef401347bf4da3 100644 (file)
--- a/tests/data/test2403
+++ b/tests/data/test2403
@@ -37,12 +37,12 @@ headers-api
 http
 http/2
 </server>
- <name>
+<name>
 HTTP/2 GET
- </name>
+</name>
 <setenv>
 </setenv>
- <command>
+<command>
 -k --http2 -w '%{header_json}\n' "https://%HOSTIP:%HTTP2TLSPORT/%TESTNUMBER"
 </command>
 

diff --git a/tests/data/test2404 b/tests/data/test2404
index 0e22bfe5f5083c83440bd101dc22cbcf6e0ded61..bcf1035aaf76d0e40b4fcf24b24886aecdb52266 100644 (file)
--- a/tests/data/test2404
+++ b/tests/data/test2404
@@ -57,10 +57,10 @@ http/2
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 HTTP/2 using STREAM_WEIGHTs
- </name>
- <command>
+</name>
+<command>
 https://%HOSTIP:%HTTP2TLSPORT/path/%TESTNUMBER %HOSTIP %HTTP2TLSPORT
 </command>
 </client>

diff --git a/tests/data/test241 b/tests/data/test241
index 8fb619cac7d2bfc612876f13417b720b07666252..92a431420dd6523bcc71b0f36bf8a55064d3bb0e 100644 (file)
--- a/tests/data/test241
+++ b/tests/data/test241
@@ -29,10 +29,10 @@ ipv6
 <server>
 http-ipv6
 </server>
- <name>
+<name>
 HTTP-IPv6 GET (using ip6-localhost)
- </name>
- <command>
+</name>
+<command>
 -g "http://ip6-localhost:%HTTP6PORT/%TESTNUMBER"
 </command>
 <precheck>

diff --git a/tests/data/test242 b/tests/data/test242
index 504555923c5130bb527702da9371c768c22e8059..a498ab29b79ec8c2e5268afa2ef51b6ffca7f72a 100644 (file)
--- a/tests/data/test242
+++ b/tests/data/test242
@@ -29,10 +29,10 @@ ipv6
 <server>
 http-ipv6
 </server>
- <name>
+<name>
 HTTP-IPv6 GET with username+password in URL
- </name>
- <command>
+</name>
+<command>
 -g "http://foobar:barfoo@%HOST6IP:%HTTP6PORT/%TESTNUMBER"
 </command>
 </client>

diff --git a/tests/data/test244 b/tests/data/test244
index 6755994d5eaf9d5814f75c324daaaeafdeededc1..782be2be403fce95c13694dadaf6aab965d51a03 100644 (file)
--- a/tests/data/test244
+++ b/tests/data/test244
@@ -31,10 +31,10 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP dir listing with nocwd and URL encoded path
- </name>
- <command>
+</name>
+<command>
 --ftp-method nocwd ftp://%HOSTIP:%FTPPORT/fir%23t/th%69rd/%TESTNUMBER/
 </command>
 </client>

diff --git a/tests/data/test245 b/tests/data/test245
index 569b4107deda795d46d972107d21f04ccef770de..78893f028e454dba852fc28ad0b8d20c6879814c 100644 (file)
--- a/tests/data/test245
+++ b/tests/data/test245
@@ -53,10 +53,10 @@ http
 !SSPI
 crypto
 </features>
- <name>
+<name>
 HTTP POST --digest
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -d "junkelijunk"
 </command>
 </client>

diff --git a/tests/data/test246 b/tests/data/test246
index 383d07d9a6c6273e590d1c21a9e3f7ad7652afeb..a756028b9c88704c4d771234ec087cb2b691ebfa 100644 (file)
--- a/tests/data/test246
+++ b/tests/data/test246
@@ -63,10 +63,10 @@ http
 !SSPI
 crypto
 </features>
- <name>
+<name>
 HTTP POST --digest with server doing a 100 before 401 response
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -d "junkelijunk"
 </command>
 </client>

diff --git a/tests/data/test247 b/tests/data/test247
index d51034c9e304659332aaa89550f43169721ed3d8..40f42e7d0608a012e80c23d0bd13a5dc9e719fc9 100644 (file)
--- a/tests/data/test247
+++ b/tests/data/test247
@@ -16,9 +16,9 @@ FTP
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP upload time condition evaluates TRUE => skip upload
- </name>
+</name>
 <file name="%LOGDIR/test%TESTNUMBER.txt">
 data
     to
@@ -27,7 +27,7 @@ that FTP
 works
   so does it?
 </file>
- <command>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt -z "apr 1 2005 08:00:00"
 </command>
 </client>

diff --git a/tests/data/test248 b/tests/data/test248
index 4d4c1a69e9fedcf7a21bfac1d2b395f7071cc0ce..097e1e583955a021f4c8b3b7adc1c738978627a4 100644 (file)
--- a/tests/data/test248
+++ b/tests/data/test248
@@ -16,9 +16,9 @@ FTP
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP upload time condition evaluates FALSE => upload anyway
- </name>
+</name>
 <file name="%LOGDIR/test%TESTNUMBER.txt">
 data
     to
@@ -27,7 +27,7 @@ that FTP
 works
   so does it?
 </file>
- <command>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt -z "apr 1 2005 08:00:00"
 </command>
 </client>

diff --git a/tests/data/test249 b/tests/data/test249
index 6a2dd2c874cd98388d88eb032995b36b733cd069..82b0a1406c8e21a0092b4348ef8aae5d612921f7 100644 (file)
--- a/tests/data/test249
+++ b/tests/data/test249
@@ -29,10 +29,10 @@ Content-Type: text/html
 <server>
 http
 </server>
- <name>
+<name>
 HTTP 304 response with "illegal" Content-Length: header
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 12:00:00 1999 GMT"
 </command>
 </client>

diff --git a/tests/data/test25 b/tests/data/test25
index 61080ca397661f7604e6684d824781b4e1386b6a..b00ef84ece696620e58cb0d39a2b67eec71c8dc0 100644 (file)
--- a/tests/data/test25
+++ b/tests/data/test25
@@ -63,10 +63,10 @@ Connection: close
 <server>
 http
 </server>
- <name>
+<name>
 looping HTTP Location: following with --max-redirs
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L --max-redirs 5
 </command>
 </client>

diff --git a/tests/data/test250 b/tests/data/test250
index b1879f252d1a1827fd21ce58d086932c12752aba..3c16fcd7b4e7f85fdfded17287ffa177d71a2c93 100644 (file)
--- a/tests/data/test250
+++ b/tests/data/test250
@@ -35,10 +35,10 @@ SLOWDOWN
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP dir list PASV with slow response
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/
 </command>
 </client>

diff --git a/tests/data/test2500 b/tests/data/test2500
index 0290a32399e54b17d8e84dbe8c856da770727cea..6ec739d1ac858d8a0db834e33712d9987a45735f 100644 (file)
--- a/tests/data/test2500
+++ b/tests/data/test2500
@@ -36,10 +36,10 @@ nghttpx-h3
 http
 http/3
 </server>
- <name>
+<name>
 HTTP/3 GET:
- </name>
- <command>
+</name>
+<command>
 --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --http3 --resolve localhost:%HTTP3PORT:%HOSTIP https://localhost:%HTTP3PORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test2501 b/tests/data/test2501
index e7013e5ee7772847b5fdda12acca7559f2c1a11d..4db52ecf6c41e9a3a6ddbdacda265147d047b5e9 100644 (file)
--- a/tests/data/test2501
+++ b/tests/data/test2501
@@ -33,12 +33,12 @@ http/3
 http
 http/3
 </server>
- <name>
+<name>
 HTTP/3 POST
- </name>
+</name>
 <setenv>
 </setenv>
- <command>
+<command>
 -k --http3 "https://%HOSTIP:%HTTP3PORT/%TESTNUMBER" -d "moo"
 </command>
 

diff --git a/tests/data/test2502 b/tests/data/test2502
index 5e4a0fd0b366e0cfbf00caf4ef14d864d0ccfb16..aae65e1cc13a57e6e6399e67c7078b7d9a3729e5 100644 (file)
--- a/tests/data/test2502
+++ b/tests/data/test2502
@@ -56,10 +56,10 @@ http/3
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 HTTP GET multiple over HTTP/3
- </name>
- <command>
+</name>
+<command>
 https://%HOSTIP:%HTTP3PORT/path/%TESTNUMBER %HOSTIP %HTTP3PORT
 </command>
 </client>

diff --git a/tests/data/test2503 b/tests/data/test2503
index 550eb8a22ec7d8c53d7a3e7b51f9fbc9eab3d782..9877ee4c1b353fe5a8ce9d55d71ba9729c6683fc 100644 (file)
--- a/tests/data/test2503
+++ b/tests/data/test2503
@@ -36,12 +36,12 @@ headers-api
 http
 http/3
 </server>
- <name>
+<name>
 HTTP/3 header-api
- </name>
+</name>
 <setenv>
 </setenv>
- <command>
+<command>
 -w '%{header_json}\n' --http3-only --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --resolve localhost:%HTTP3PORT:%HOSTIP https://localhost:%HTTP3PORT/%TESTNUMBER
 </command>
 

diff --git a/tests/data/test251 b/tests/data/test251
index 04ad01709699c3f82d6219330e0a9b1eda62138b..46124bfecab2aab6e100b169056069a15761198b 100644 (file)
--- a/tests/data/test251
+++ b/tests/data/test251
@@ -33,10 +33,10 @@ SLOWDOWN
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP dir list, PORT with specified IP and slow response
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/ -P %CLIENTIP
 </command>
 </client>

diff --git a/tests/data/test252 b/tests/data/test252
index 559ece0c988e8380d12e9b600720e611a0a62e35..220cda189967946d02b6d3d92963b343ecb7e72f 100644 (file)
--- a/tests/data/test252
+++ b/tests/data/test252
@@ -36,10 +36,10 @@ ipv6
 <server>
 ftp-ipv6
 </server>
- <name>
+<name>
 FTP IPv6 dir list PASV
- </name>
- <command>
+</name>
+<command>
 -g "ftp://%HOST6IP:%FTP6PORT/"
 </command>
 </client>

diff --git a/tests/data/test253 b/tests/data/test253
index 8974a8b073ab6e0f209a9bfc2694eca46527d587..2c1008d7e57cfdd42d6dbccd6c6a31a139b31d30 100644 (file)
--- a/tests/data/test253
+++ b/tests/data/test253
@@ -36,10 +36,10 @@ ipv6
 <server>
 ftp-ipv6
 </server>
- <name>
+<name>
 FTP IPv6 dir list with EPRT
- </name>
- <command>
+</name>
+<command>
 -g "ftp://%HOST6IP:%FTP6PORT/" -P -
 </command>
 </client>

diff --git a/tests/data/test254 b/tests/data/test254
index a9ea0cceea0d0729a9ccc52e80945e4f61a914c7..30978758f7514af0a6151fe2d841cdc7bae39ef1 100644 (file)
--- a/tests/data/test254
+++ b/tests/data/test254
@@ -37,10 +37,10 @@ ipv6
 <server>
 ftp-ipv6
 </server>
- <name>
+<name>
 FTP IPv6 dir list PASV and --disable-epsv
- </name>
- <command>
+</name>
+<command>
 -g "ftp://%HOST6IP:%FTP6PORT/" --disable-epsv
 </command>
 </client>

diff --git a/tests/data/test255 b/tests/data/test255
index 79d43af7c5d36235b3d383486a73f52eff34ec2c..37b9da2acfe6b7a750c6da9ee95bf15cb5df74de 100644 (file)
--- a/tests/data/test255
+++ b/tests/data/test255
@@ -37,10 +37,10 @@ ipv6
 <server>
 ftp-ipv6
 </server>
- <name>
+<name>
 FTP IPv6 dir list with EPRT and --disable-eprt
- </name>
- <command>
+</name>
+<command>
 -g "ftp://%HOST6IP:%FTP6PORT/" -P - --disable-eprt
 </command>
 </client>

diff --git a/tests/data/test256 b/tests/data/test256
index cbb8714649f0c9b1ff8f6b5c72014413e84f240c..f370d73ab9f42c9d5ddfee435bf63c29510fbf43 100644 (file)
--- a/tests/data/test256
+++ b/tests/data/test256
@@ -25,9 +25,9 @@ todelooooo lalalala yada yada, we know nothing about ranges ;-)
 <server>
 http
 </server>
- <name>
+<name>
 HTTP resume request over proxy with auth without server supporting it
- </name>
+</name>
  <command option="no-output">
 -x http://%HOSTIP:%HTTPPORT http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -C - --no-include -o %LOGDIR/fewl%TESTNUMBER.txt -U daniel:stenberg
 </command>

diff --git a/tests/data/test257 b/tests/data/test257
index ac38ac5fbdb939be13b89bd01aac4dfe658ed0c1..5eabf363ad8c6725f9e0cd09c99ed10873d7ac9a 100644 (file)
--- a/tests/data/test257
+++ b/tests/data/test257
@@ -67,10 +67,10 @@ If this is received, the location following worked
 <server>
 http
 </server>
- <name>
+<name>
 HTTP Location: following with --netrc-optional
- </name>
- <command>
+</name>
+<command>
 http://supersite.com/want/%TESTNUMBER -L -x http://%HOSTIP:%HTTPPORT --netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER
 </command>
 <features>

diff --git a/tests/data/test258 b/tests/data/test258
index e925e66b1f699af31b27d99c3308d1fde1349dbd..69f2613f5fc1e4ff3fd237d7d150fafb25f40d09 100644 (file)
--- a/tests/data/test258
+++ b/tests/data/test258
@@ -61,10 +61,10 @@ Mime
 crypto
 proxy
 </features>
- <name>
+<name>
 HTTP POST multipart without Expect: header using proxy anyauth (Digest)
- </name>
- <command>
+</name>
+<command>
 -x http://%HOSTIP:%HTTPPORT http://remotehost:54321/we/want/%TESTNUMBER -F name=daniel -F tool=curl -F file=@%LOGDIR/test%TESTNUMBER.txt -H "Expect:" -U uuuser:pppassword --proxy-anyauth
 </command>
 # We create this file before the command is invoked!

diff --git a/tests/data/test259 b/tests/data/test259
index b3cb8275eb7f630a308f1b2687f6adf582068c4c..b3796cef37ba4c64570c8222c483f9d5876482b8 100644 (file)
--- a/tests/data/test259
+++ b/tests/data/test259
@@ -57,10 +57,10 @@ Mime
 crypto
 proxy
 </features>
- <name>
+<name>
 HTTP POST multipart with Expect: header using proxy anyauth (Digest)
- </name>
- <command>
+</name>
+<command>
 -x http://%HOSTIP:%HTTPPORT http://remotehost:54321/we/want/%TESTNUMBER -F name=daniel -F tool=curl -F file=@%LOGDIR/test%TESTNUMBER.txt -U uuuser:pppassword --proxy-anyauth -H "Expect: 100-continue"
 </command>
 # We create this file before the command is invoked!

diff --git a/tests/data/test26 b/tests/data/test26
index cd8ba426cc8d7b002c8ecbbe9f2c87083d9625fb..9e334bc5b50acd97c6248e5ea3dbe1178b5ee266 100644 (file)
--- a/tests/data/test26
+++ b/tests/data/test26
@@ -21,10 +21,10 @@ Connection: close
 <server>
 http
 </server>
- <name>
+<name>
 specify more -o than URLs
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -o - -o -
 </command>
 </client>

diff --git a/tests/data/test260 b/tests/data/test260
index b706e60b5f490a6b19829d1648bf43fbb90befc8..7793b7646a7ecc927af21acc5dd4f3b59d9fc537 100644 (file)
--- a/tests/data/test260
+++ b/tests/data/test260
@@ -31,10 +31,10 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET URL without slash but with questionmark
- </name>
- <command>
+</name>
+<command>
 "http://%HOSTIP:%HTTPPORT?%TESTNUMBER"
 </command>
 </client>

diff --git a/tests/data/test2600 b/tests/data/test2600
index 829ea0c6fe7d88c99ba92711c441e116c536f5c8..5b88aedb7da9fc19d4f29f00cfabd7d410091613 100644 (file)
--- a/tests/data/test2600
+++ b/tests/data/test2600
@@ -18,8 +18,8 @@ unittest
 debug
 http
 </features>
- <name>
+<name>
 connection filter connect/destroy unit tests
- </name>
+</name>
 </client>
 </testcase>

diff --git a/tests/data/test2601 b/tests/data/test2601
index 1ca0b9c83035f6840046871c4787fccc4fbafe41..778f6c54a7d4fa4496b91b4a750e97b1305139b2 100644 (file)
--- a/tests/data/test2601
+++ b/tests/data/test2601
@@ -15,8 +15,8 @@ none
 <features>
 unittest
 </features>
- <name>
+<name>
 bufq unit tests
- </name>
+</name>
 </client>
 </testcase>

diff --git a/tests/data/test2602 b/tests/data/test2602
index e811f29c27a2ac4c9e30dbbeec6cc876358fa727..798cd02c04b669981e4b8c85a42f5686a29afd0e 100644 (file)
--- a/tests/data/test2602
+++ b/tests/data/test2602
@@ -15,8 +15,8 @@ none
 <features>
 unittest
 </features>
- <name>
+<name>
 dynhds unit tests
- </name>
+</name>
 </client>
 </testcase>

diff --git a/tests/data/test2603 b/tests/data/test2603
index dfb3735ee2e4af4d395870abc648112de1728254..c8845bb2e127349bc33346f2e251907fd1d76468 100644 (file)
--- a/tests/data/test2603
+++ b/tests/data/test2603
@@ -15,8 +15,8 @@ none
 <features>
 unittest
 </features>
- <name>
+<name>
 http1 parser unit tests
- </name>
+</name>
 </client>
 </testcase>

diff --git a/tests/data/test261 b/tests/data/test261
index 8a68ba9cd6e6fe059ac91aa46084070ac87bff60..d5f940372e8dcb6fbf388f9fb9e7fd285eaf8533 100644 (file)
--- a/tests/data/test261
+++ b/tests/data/test261
@@ -23,10 +23,10 @@ REPLY TYPE 226 Kind of on the positive side!
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP RETR with 226 response code to TYPE
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test262 b/tests/data/test262
index d119d667232e016cfaadbc4c5b41b763408bf272..ef9c731f5e8077fa80abaaf94fde9d594128686b 100644 (file)
Binary files a/tests/data/test262 and b/tests/data/test262 differ

diff --git a/tests/data/test263 b/tests/data/test263
index 7a2bff9ecd10d61d9a39c36dd88e5eaf1d61e99e..93e98a1970e2bdb22fd9354fac20f5c61ad13218 100644 (file)
--- a/tests/data/test263
+++ b/tests/data/test263
@@ -30,10 +30,10 @@ proxy
 <server>
 http-ipv6
 </server>
- <name>
+<name>
 HTTP-IPv6 GET with proxy specified using IPv6-numerical address
- </name>
- <command>
+</name>
+<command>
 -g -x "http://%HOST6IP:%HTTP6PORT" http://veryveryremotesite.com/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test264 b/tests/data/test264
index c4c3652998443d4b703b9d898684a3e9ee3e76f3..a4ce251524363c9dd7e762c63ba931373a202adc 100644 (file)
--- a/tests/data/test264
+++ b/tests/data/test264
@@ -24,10 +24,10 @@ the content would go here
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with proxy string including http:// and user+password
- </name>
- <command>
+</name>
+<command>
 http://we.want.that.site.com/%TESTNUMBER -x http://f%61ke:user@%HOSTIP:%HTTPPORT
 </command>
 <features>

diff --git a/tests/data/test266 b/tests/data/test266
index d30c70aac6a1dba5071e9fe3cd9cf870461f1176..8604c609b89efa829d23c89cfba1264a563eb6de 100644 (file)
--- a/tests/data/test266
+++ b/tests/data/test266
@@ -49,10 +49,10 @@ writedelay: 10
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with chunked Transfer-Encoding and chunked trailer
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test269 b/tests/data/test269
index 36014c808b50a7faae5314482b24b67d3a9c513d..724fa4dc97b2a476df01a6ddd229089f048a03fb 100644 (file)
--- a/tests/data/test269
+++ b/tests/data/test269
@@ -32,10 +32,10 @@ muahahaha
 <server>
 http
 </server>
- <name>
+<name>
 HTTP --ignore-content-length
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --ignore-content-length
 </command>
 </client>

diff --git a/tests/data/test27 b/tests/data/test27
index fba169510f155761a1adf5f35e78bf4ae66b0123..75c73acc2bfd9c55e8e889349a98b1f86338b75a 100644 (file)
--- a/tests/data/test27
+++ b/tests/data/test27
@@ -23,10 +23,10 @@ Content-Length: 8
 <server>
 http
 </server>
- <name>
+<name>
 Get same cookie page several times
- </name>
- <command>
+</name>
+<command>
 "http://%HOSTIP:%HTTPPORT/want/{%TESTNUMBER,%TESTNUMBER,%TESTNUMBER}" -b none
 </command>
 <features>

diff --git a/tests/data/test270 b/tests/data/test270
index 983e0d2b7f2bcb38c153200b3c6cde60d39b2362..efa183f1559be0c85593c52c58aa62e16b4c9490 100644 (file)
--- a/tests/data/test270
+++ b/tests/data/test270
@@ -26,10 +26,10 @@ PASVBADIP
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP RETR PASV --ftp-skip-pasv-ip
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-skip-pasv-ip --disable-epsv
 </command>
 </client>

diff --git a/tests/data/test271 b/tests/data/test271
index a82519875725755f2825c54557cbd484c9972e8e..2903ccf23b3d91ea0770e00f776f0eebb2d18cc5 100644 (file)
--- a/tests/data/test271
+++ b/tests/data/test271
@@ -23,10 +23,10 @@ returned
 <server>
 tftp
 </server>
- <name>
+<name>
 TFTP retrieve
- </name>
- <command>
+</name>
+<command>
 tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test272 b/tests/data/test272
index 90f9e419876728b0ba0aba5f888d502b241611fc..2857c3eac3a18be2cb456dd88cee1c0fc7d21b5d 100644 (file)
--- a/tests/data/test272
+++ b/tests/data/test272
@@ -18,10 +18,10 @@ RETR
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP timed conditioned get file with identical time stamp
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -z "2004 jan 1 12:12:12 UTC"
 </command>
 

diff --git a/tests/data/test273 b/tests/data/test273
index b2b023a60706a8854cf829008f0fb9670d196793..4dc23e0dd555a52e105f38e769f0782041522510 100644 (file)
--- a/tests/data/test273
+++ b/tests/data/test273
@@ -55,10 +55,10 @@ http
 !SSPI
 crypto
 </features>
- <name>
+<name>
 HTTP with two Digest authorization headers
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
 </command>
 </client>

diff --git a/tests/data/test274 b/tests/data/test274
index b0f74b49442ef7de883e6c67cd64c7563dac593d..bb72006148400a0e0653109ed0b879e3682cf49e 100644 (file)
--- a/tests/data/test274
+++ b/tests/data/test274
@@ -24,10 +24,10 @@ Connection: close
 <server>
 http
 </server>
- <name>
+<name>
 HTTP Location: following with --max-redirs 0
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L --max-redirs 0
 </command>
 </client>

diff --git a/tests/data/test275 b/tests/data/test275
index c6b6b566e681f5092bd7398e071d951530412785..d0abcac18485fddad3f7168d120d37176c938cf7 100644 (file)
--- a/tests/data/test275
+++ b/tests/data/test275
@@ -50,10 +50,10 @@ contents
 http
 http-proxy
 </server>
- <name>
+<name>
 HTTP CONNECT with proxytunnel getting two URLs from the same host
- </name>
- <command>
+</name>
+<command>
 http://remotesite.com.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER -p -x %HOSTIP:%PROXYPORT --user iam:myself --proxy-user youare:yourself http://remotesite.com.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER
 </command>
 <features>

diff --git a/tests/data/test276 b/tests/data/test276
index 07a1aaed171bd1b4d4ee9caf08f9a98dccb494bd..6814f9ed7b25c674c5efe88596a103033076b7f5 100644 (file)
--- a/tests/data/test276
+++ b/tests/data/test276
@@ -49,10 +49,10 @@ If this is received, the location following worked
 <server>
 http
 </server>
- <name>
+<name>
 HTTP Location: following with multiple question marks in URLs
- </name>
- <command>
+</name>
+<command>
 "http://%HOSTIP:%HTTPPORT/want?uri=http://anything/%TESTNUMBER?secondq/%TESTNUMBER" -L
 </command>
 </client>

diff --git a/tests/data/test277 b/tests/data/test277
index 1e091e3ddd91cf6d0c2af20a9e8398674ce092c1..69a17fea5ef155f7374761bcc8ca9e8af04e259a 100644 (file)
--- a/tests/data/test277
+++ b/tests/data/test277
@@ -26,10 +26,10 @@ Mime
 <server>
 http
 </server>
- <name>
+<name>
 HTTP RFC1867-type formposting with custom Content-Type
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -F name=daniel -H "Content-Type: text/info"
 </command>
 </client>

diff --git a/tests/data/test278 b/tests/data/test278
index 7cbd4704b18d267280b7d9941d47842b36e83bbb..e2daab39f0e76d2d4e2955dd44653f2801cf4783 100644 (file)
--- a/tests/data/test278
+++ b/tests/data/test278
@@ -24,10 +24,10 @@ the content would go here
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with proxy string including http:// and user+empty password
- </name>
- <command>
+</name>
+<command>
 http://we.want.that.site.com/%TESTNUMBER -x http://f%61ke:@%HOSTIP:%HTTPPORT
 </command>
 <features>

diff --git a/tests/data/test279 b/tests/data/test279
index cc919224d50a1e8f37a0acb021ef8260dfd86cc2..740e351de716faf3da7ad87eeb2f07defa8477a8 100644 (file)
--- a/tests/data/test279
+++ b/tests/data/test279
@@ -25,10 +25,10 @@ the content would go here
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with proxy string including http:// and user only
- </name>
- <command>
+</name>
+<command>
 http://we.want.that.site.com/%TESTNUMBER -x http://f%61ke@%HOSTIP:%HTTPPORT
 </command>
 <features>

diff --git a/tests/data/test28 b/tests/data/test28
index 1966cc86304e4063b9c68e2393a8ee186046fda2..24815a2c2c3a61bd21bf69ed400755bc763b2520 100644 (file)
--- a/tests/data/test28
+++ b/tests/data/test28
@@ -52,10 +52,10 @@ If this is received, the location following worked
 <server>
 http
 </server>
- <name>
+<name>
 HTTP Location: following with extra spaces in header
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L
 </command>
 </client>

diff --git a/tests/data/test280 b/tests/data/test280
index 71c147ce46ef9fdcf220fc1d77d125551a19cc0e..1ed41e6528f9cd913737abfd23f8b534c9b1ab17 100644 (file)
--- a/tests/data/test280
+++ b/tests/data/test280
@@ -37,10 +37,10 @@ COUNT USER 1
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP --ftp-alternative-to-user on USER failure
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ --ftp-alternative-to-user "USER replacement"
 </command>
 </client>

diff --git a/tests/data/test281 b/tests/data/test281
index 06ca27b7c3a99040a59e02aad4abe83905d91dff..23af513a02a78d1dfeb962e4424d7155d1cdedc1 100644 (file)
--- a/tests/data/test281
+++ b/tests/data/test281
@@ -24,10 +24,10 @@ Server: test-server/fake
 <server>
 http
 </server>
- <name>
+<name>
 HTTP PUT from file with 100 + 401 responses and -f without auth given
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -f -T %LOGDIR/test%TESTNUMBER.txt
 </command>
 <file name="%LOGDIR/test%TESTNUMBER.txt">

diff --git a/tests/data/test282 b/tests/data/test282
index 4fb9e598e574f7521a7782dde2c25eb3b22dbd99..68d3b428cbcdbdbe12bf99b50bd6b2f03519fb08 100644 (file)
--- a/tests/data/test282
+++ b/tests/data/test282
@@ -21,10 +21,10 @@ HTTP/1.1 200 OK swsclose
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with no response body or headers
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test283 b/tests/data/test283
index 0f2d0089a6407b8eb157c737bf6acb6b5ee0cde7..bf8cc3a9196e9ac2c3e354158fb3083532512f07 100644 (file)
--- a/tests/data/test283
+++ b/tests/data/test283
@@ -13,10 +13,10 @@ FAILURE
 <server>
 tftp
 </server>
- <name>
+<name>
 TFTP retrieve on invalid file
- </name>
- <command>
+</name>
+<command>
 tftp://%HOSTIP:%TFTPPORT//invalid-file --tftp-blksize 1024
 </command>
 </client>

diff --git a/tests/data/test284 b/tests/data/test284
index a18f4929e533db7e61239dd2a363b7d47d8ab34a..9681e56952498d8ead75cbe10a6a72463a48f172 100644 (file)
--- a/tests/data/test284
+++ b/tests/data/test284
@@ -47,10 +47,10 @@ condition in the TFTP receive code.
 <server>
 tftp
 </server>
- <name>
+<name>
 TFTP retrieve of boundary case 512 byte file
- </name>
- <command>
+</name>
+<command>
 tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test285 b/tests/data/test285
index 8cb479a12995a63c9b3268e31921222606af3577..7968e1a34c5acf5df029512147dbbedde91ba681 100644 (file)
--- a/tests/data/test285
+++ b/tests/data/test285
@@ -12,10 +12,10 @@ TFTP WRQ
 <server>
 tftp
 </server>
- <name>
+<name>
 TFTP send
- </name>
- <command>
+</name>
+<command>
 -T %LOGDIR/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT// --connect-time 549
 </command>
 <file name="%LOGDIR/test%TESTNUMBER.txt">

diff --git a/tests/data/test286 b/tests/data/test286
index d51ec106220cb4262a636ae395b465aa140a7c0d..e5f09bfd5af391fd01a77bd727eccf9556b9c73c 100644 (file)
--- a/tests/data/test286
+++ b/tests/data/test286
@@ -12,10 +12,10 @@ TFTP WRQ
 <server>
 tftp
 </server>
- <name>
+<name>
 TFTP send of boundary case 512 byte file
- </name>
- <command>
+</name>
+<command>
 -T %LOGDIR/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//
 </command>
 <file name="%LOGDIR/test%TESTNUMBER.txt">

diff --git a/tests/data/test287 b/tests/data/test287
index 71ab8d527d6c3720d84887f9a03fd80bc3d5c001..85d557ec96d9e64f4957317b67f37e54b2e2c75f 100644 (file)
--- a/tests/data/test287
+++ b/tests/data/test287
@@ -24,10 +24,10 @@ And you should ignore this data.
 <server>
 http
 </server>
- <name>
+<name>
 HTTP proxy CONNECT with custom User-Agent header
- </name>
- <command>
+</name>
+<command>
 http://test.remote.example.com.%TESTNUMBER:%HTTPPORT/path/%TESTNUMBER -H "User-Agent: looser/2015" --proxy http://%HOSTIP:%HTTPPORT --proxytunnel --proxy-header "User-Agent: looser/2007"
 </command>
 <features>

diff --git a/tests/data/test288 b/tests/data/test288
index 164cf20e76160efcbdd8d02c8263564fde94cb93..a341df61fb56e0763ef4ecfc714196693a68e31d 100644 (file)
--- a/tests/data/test288
+++ b/tests/data/test288
@@ -24,9 +24,9 @@ none
 <features>
 file
 </features>
- <name>
+<name>
 file:// with (unsupported) proxy, authentication and range
- </name>
+</name>
 <setenv>
 all_proxy=http://fake:user@%HOSTIP:%NOLISTENPORT/
 </setenv>

diff --git a/tests/data/test289 b/tests/data/test289
index 4b80c908cb8964b1f6c02974f515d215aa247de2..dff384bfe7931a2850a5c494e8f71aef9c3494a8 100644 (file)
--- a/tests/data/test289
+++ b/tests/data/test289
@@ -13,10 +13,10 @@ FAILURE
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP resume upload but denied access to local file
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/illegal-nonexistent-file -C -
 </command>
 </client>

diff --git a/tests/data/test29 b/tests/data/test29
index bb9916e83b5589960983233cb97d7f7ae2132e90..64d5e6c6bfc56a636b9f686b85bc9eaf1d76a55c 100644 (file)
--- a/tests/data/test29
+++ b/tests/data/test29
@@ -26,10 +26,10 @@ wait 10
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with 2 secs timeout
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -m 2
 </command>
 </client>

diff --git a/tests/data/test290 b/tests/data/test290
index 9e59311523c7daa00de10d07bdfcfa641a8d80fb..e7048a5384d5e5552109090919fc727c31f4b74c 100644 (file)
--- a/tests/data/test290
+++ b/tests/data/test290
@@ -17,10 +17,10 @@ FTP
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP download maximum filesize exceeded
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --max-filesize 30
 </command>
 </client>

diff --git a/tests/data/test291 b/tests/data/test291
index 45f041e2e41e554b3d17a79d2f121f0b76fb9fa8..05cc2b444a0687f7e7885c8821175977f534bc7f 100644 (file)
--- a/tests/data/test291
+++ b/tests/data/test291
@@ -23,10 +23,10 @@ works
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP download maximum filesize not exceeded
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --max-filesize 100
 </command>
 </client>

diff --git a/tests/data/test292 b/tests/data/test292
index 91e2d66705321d47af87688bdda7f152120dab01..0ae74a9bc0450dc2c1b597260197a9f351be444a 100644 (file)
--- a/tests/data/test292
+++ b/tests/data/test292
@@ -32,10 +32,10 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with maximum filesize not exceeded
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --max-filesize 1000
 </command>
 </client>

diff --git a/tests/data/test293 b/tests/data/test293
index aaeefc45791f54ac5e7a7802cbd6c153c7cc163e..04f98999103e825bcc25ae885e90a53926c0b36e 100644 (file)
--- a/tests/data/test293
+++ b/tests/data/test293
@@ -33,10 +33,10 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with maximum filesize exceeded
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --max-filesize 2
 </command>
 </client>

diff --git a/tests/data/test294 b/tests/data/test294
index 4dc90e368304b7d2dfa029ae93426797c98712d1..b840b8c70f638379a5d1069378dbd64de3dd1f3c 100644 (file)
--- a/tests/data/test294
+++ b/tests/data/test294
@@ -38,10 +38,10 @@ REPLY ACCT 230 Thank-you for the ACCT
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP --ftp-account on ACCT request
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ --ftp-account "data for acct"
 </command>
 </client>

diff --git a/tests/data/test295 b/tests/data/test295
index 206c1ab744a8f4ac63315bf0884f79f8e1356781..ebb1a3697604512e2b6c8af5588f9088a1f8c839 100644 (file)
--- a/tests/data/test295
+++ b/tests/data/test295
@@ -23,10 +23,10 @@ REPLY PWD 530 No ACCT, go away
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP ACCT request without --ftp-account
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/
 </command>
 </client>

diff --git a/tests/data/test296 b/tests/data/test296
index 3c36a160896ea02b45a1eac73e8fa4d9b7f11440..c88ec99bf7cf6ae7ad532f49731e16d115c957f9 100644 (file)
--- a/tests/data/test296
+++ b/tests/data/test296
@@ -21,10 +21,10 @@ bla bla bla
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP CWD with --ftp-method multicwd
- </name>
- <command>
+</name>
+<command>
 --ftp-method multicwd ftp://%HOSTIP:%FTPPORT/first/second/third/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test297 b/tests/data/test297
index e4cdd856c5ec872faa9c04da2e6602029c42cdbf..99c10d3e135bce97db8b1011a667fa4310ab6954 100644 (file)
--- a/tests/data/test297
+++ b/tests/data/test297
@@ -21,10 +21,10 @@ bla bla bla
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP CWD with --ftp-method singlecwd
- </name>
- <command>
+</name>
+<command>
 --ftp-method singlecwd ftp://%HOSTIP:%FTPPORT/first/second/third/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test298 b/tests/data/test298
index 20c8eccf27639ac8bba35434977757c418953473..5188c85477d1b11fa8e69499f9f2f693883aa4ba 100644 (file)
--- a/tests/data/test298
+++ b/tests/data/test298
@@ -21,10 +21,10 @@ bla bla bla
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP CWD with --ftp-method nocwd
- </name>
- <command>
+</name>
+<command>
 --ftp-method nocwd ftp://%HOSTIP:%FTPPORT/first/second/th%69rd/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test299 b/tests/data/test299
index 9b3fd0c30e3e6342de9adb1c549f4f5de4bb6bef..fc80c6296f2d862432ba1b4071a501f167e1ae5e 100644 (file)
--- a/tests/data/test299
+++ b/tests/data/test299
@@ -29,10 +29,10 @@ http
 ftp
 proxy
 </features>
- <name>
+<name>
 FTP over HTTP proxy with user:pass not in url
- </name>
- <command>
+</name>
+<command>
 -x http://%HOSTIP:%HTTPPORT -u michal:aybabtu ftp://host.com/we/want/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test3 b/tests/data/test3
index f28d0ccd434b83a168f291cda392bf628d536952..6c5eb6b7126bfd2edaaf7da6584905c28e3e0bb7 100644 (file)
--- a/tests/data/test3
+++ b/tests/data/test3
@@ -32,10 +32,10 @@ Content-Length: 0
 <server>
 http
 </server>
- <name>
+<name>
 HTTP POST with auth and contents but with content-length set to 0
- </name>
- <command>
+</name>
+<command>
  -d "fooo=mooo&pooo=clue&doo=%20%20%20++++" -u "fake:-user" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test30 b/tests/data/test30
index 2a84b4c36c3f820dcb257782991e7954807d9100..6d6a7f645274acecb04c9b9a4cab6a40000c9f16 100644 (file)
--- a/tests/data/test30
+++ b/tests/data/test30
@@ -17,10 +17,10 @@ FAILURE
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with no data in server reply
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test300 b/tests/data/test300
index efbf97fe3775bac9337bf9ccfc464cfde8f5cfef..2eb5f11a6fe0cd2fc2523ffdb3798e6d4d14fd73 100644 (file)
--- a/tests/data/test300
+++ b/tests/data/test300
@@ -28,10 +28,10 @@ SSL
 <server>
 https
 </server>
- <name>
+<name>
 simple HTTPS GET
- </name>
- <command>
+</name>
+<command>
 -k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test3002 b/tests/data/test3002
index b6c94ec3ce210bf77827fed1ed3da3709cd9a63b..a956913a2afc99c6349e79c81c5e2893f84adc78 100644 (file)
--- a/tests/data/test3002
+++ b/tests/data/test3002
@@ -16,16 +16,16 @@ SMTP
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP with multiple and invalid (first) --mail-rcpt and --mail-rcpt-allowfails
- </name>
+</name>
 <stdin>
 From: different\r
 To: another\r
 \r
 body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt invalid.one --mail-rcpt recipient.two@example.com --mail-rcpt recipient.three@example.com --mail-rcpt recipient.four@example.com --mail-rcpt recipient.five@example.com --mail-from sender@example.com -T -
 </command>
 </client>

diff --git a/tests/data/test3003 b/tests/data/test3003
index 23e86c05ecbfc7982d822f9ceafda52fc8503b70..28dd7f8084df66951c35098e100f99d28d164b51 100644 (file)
--- a/tests/data/test3003
+++ b/tests/data/test3003
@@ -16,16 +16,16 @@ SMTP
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP with multiple and invalid (last) --mail-rcpt and --mail-rcpt-allowfails
- </name>
+</name>
 <stdin>
 From: different\r
 To: another\r
 \r
 body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt recipient.one@example.com --mail-rcpt recipient.two@example.com --mail-rcpt recipient.three@example.com --mail-rcpt recipient.four@example.com --mail-rcpt invalid.five --mail-from sender@example.com -T -
 </command>
 </client>

diff --git a/tests/data/test3004 b/tests/data/test3004
index 1f646eeaba3de64eaa8d4667c3870f69379c718a..d46ba6ccc78a803274d24aecbbd7ab473c746505 100644 (file)
--- a/tests/data/test3004
+++ b/tests/data/test3004
@@ -16,16 +16,16 @@ SMTP
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP with multiple and invalid (middle) --mail-rcpt and --mail-rcpt-allowfails
- </name>
+</name>
 <stdin>
 From: different\r
 To: another\r
 \r
 body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt recipient.one@example.com --mail-rcpt recipient.two@example.com --mail-rcpt invalid.three --mail-rcpt recipient.four@example.com --mail-rcpt recipient.five@example.com --mail-from sender@example.com -T -
 </command>
 </client>

diff --git a/tests/data/test3005 b/tests/data/test3005
index ffaa475bd9050569f83afeaa73221c0b0b82accb..2f829f446c7296e9f0f0fbb4446761535d0c17f7 100644 (file)
--- a/tests/data/test3005
+++ b/tests/data/test3005
@@ -16,16 +16,16 @@ SMTP
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP with multiple and invalid (all but one) --mail-rcpt and --mail-rcpt-allowfails
- </name>
+</name>
 <stdin>
 From: different\r
 To: another\r
 \r
 body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt invalid.one --mail-rcpt recipient.two@example.com --mail-rcpt invalid.three --mail-rcpt invalid.four --mail-rcpt invalid.five --mail-from sender@example.com -T -
 </command>
 </client>

diff --git a/tests/data/test3006 b/tests/data/test3006
index 9753d74fc01813eadd6e3708ac39e28fc1c4b1e7..5ebf0bdf1643a061566a7623d10c6231df17d801 100644 (file)
--- a/tests/data/test3006
+++ b/tests/data/test3006
@@ -16,16 +16,16 @@ SMTP
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP with multiple invalid (all) --mail-rcpt and --mail-rcpt-allowfails
- </name>
+</name>
 <stdin>
 From: different\r
 To: another\r
 \r
 body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt invalid.one --mail-rcpt invalid.two --mail-rcpt invalid.three --mail-rcpt invalid.four --mail-rcpt invalid.five --mail-from sender@example.com -T -
 </command>
 </client>

diff --git a/tests/data/test3007 b/tests/data/test3007
index 74497ed12f09f97214c06419749286a915903c73..9a4aede6f85b4eae043bc3ed0e0b4584f28cbb5b 100644 (file)
--- a/tests/data/test3007
+++ b/tests/data/test3007
@@ -16,16 +16,16 @@ SMTP
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP with invalid --mail-rcpt and --mail-rcpt-allowfails
- </name>
+</name>
 <stdin>
 From: different\r
 To: another\r
 \r
 body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt invalid.one --mail-from sender@example.com -T -
 </command>
 </client>

diff --git a/tests/data/test301 b/tests/data/test301
index 167a718aba0dc7015b0fdca0fa025511270e81bb..a073011819a9d0e52372431264799e41c3b1da1e 100644 (file)
--- a/tests/data/test301
+++ b/tests/data/test301
@@ -29,10 +29,10 @@ SSL
 <server>
 https
 </server>
- <name>
+<name>
 HTTPS GET with user and password
- </name>
- <command>
+</name>
+<command>
 -k -u fake:user https://%HOSTIP:%HTTPSPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test3015 b/tests/data/test3015
index 523d06a084d7a6604974fb390582975b51b991d3..5b59bba3205c78afa55f6d2d0cedbb51f76c079f 100644 (file)
--- a/tests/data/test3015
+++ b/tests/data/test3015
@@ -46,10 +46,10 @@ monster
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET -w num_headers with redirected fetch (2 connects)
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_headers}\n" -L -o/dev/null
 </command>
 </client>

diff --git a/tests/data/test302 b/tests/data/test302
index 755d4b224fee8c28c6c8522c5b59c182bc3d3268..f6f33c276c3e3da75cc79daf41b618ba368a6c58 100644 (file)
--- a/tests/data/test302
+++ b/tests/data/test302
@@ -29,10 +29,10 @@ proxy
 <server>
 https
 </server>
- <name>
+<name>
 HTTPS GET over HTTP proxy fails
- </name>
- <command>
+</name>
+<command>
 -k -U fake:user -x %HOSTIP:%HTTPPORT https://bad.fakeurl-to.test:%TESTNUMBER/slash/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test3021 b/tests/data/test3021
index cc126773ee5300563965906b6db392027f5333ad..bdf8f375cf1b924dc26bd8ce096aeea3cac940bf 100644 (file)
--- a/tests/data/test3021
+++ b/tests/data/test3021
@@ -24,10 +24,10 @@ libssh2
 <server>
 sftp
 </server>
- <name>
+<name>
 SFTP correct sha256 host key
- </name>
- <command>
+</name>
+<command>
 --hostpubsha256 %SSHSRVSHA256 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt
 </command>
 <setenv>

diff --git a/tests/data/test3022 b/tests/data/test3022
index 45cdf879493d20077ce80e103c48492be3e9ffdb..d76e5f4936b7b5b8d876324e7e14dffe75067ebb 100644 (file)
--- a/tests/data/test3022
+++ b/tests/data/test3022
@@ -24,10 +24,10 @@ libssh2
 <server>
 scp
 </server>
- <name>
+<name>
 SCP correct sha256 host key
- </name>
- <command>
+</name>
+<command>
 --hostpubsha256 %SSHSRVSHA256 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt
 </command>
 <setenv>

diff --git a/tests/data/test3027 b/tests/data/test3027
index 6d7aeb620bd1867b659b3ea47dca41c10591847b..05a811f4e801df533c4ca0505665880e2f925fa8 100644 (file)
--- a/tests/data/test3027
+++ b/tests/data/test3027
@@ -24,9 +24,9 @@ data blobb
 <server>
 ftp
 </server>
- <name>
+<name>
 Get a file via FTP but 550 after MDTM command
- </name>
+</name>
 <tool>
 lib3027
 </tool>

diff --git a/tests/data/test303 b/tests/data/test303
index ea48b508f6c77e03992b8740399660450dc60ca2..9b656a7951cb3225fca3e5927deeda28e2ae5b92 100644 (file)
--- a/tests/data/test303
+++ b/tests/data/test303
@@ -33,10 +33,10 @@ https
 <killserver>
 https
 </killserver>
- <name>
+<name>
 HTTPS with 8 secs timeout
- </name>
- <command>
+</name>
+<command>
 -k https://%HOSTIP:%HTTPSPORT/want/%TESTNUMBER -m 8
 </command>
 </client>

diff --git a/tests/data/test304 b/tests/data/test304
index 8e7c7246c52c646245043617aab10f7e3d476424..f5ba5153c340ac1023abf66b011f06e9805eb775 100644 (file)
--- a/tests/data/test304
+++ b/tests/data/test304
@@ -27,10 +27,10 @@ SSL
 <server>
 https
 </server>
- <name>
+<name>
 HTTPS multipart formpost
- </name>
- <command>
+</name>
+<command>
 -k https://%HOSTIP:%HTTPSPORT/we/want/%TESTNUMBER -F name=daniel -F tool=curl -F file=@%LOGDIR/test%TESTNUMBER.txt
 </command>
 # We create this file before the command is invoked!

diff --git a/tests/data/test305 b/tests/data/test305
index 4ca5789ed78abcec7c1922f64aa486546dfbc7da..9e7dc8dcb0f9a471170513ad1d2737276354c801 100644 (file)
--- a/tests/data/test305
+++ b/tests/data/test305
@@ -15,10 +15,10 @@ SSL
 <server>
 https
 </server>
- <name>
+<name>
 insecure HTTPS without permission
- </name>
- <command>
+</name>
+<command>
 https://%HOSTIP:%HTTPSPORT/want/%TESTNUMBER --cacert moooo
 </command>
 </client>

diff --git a/tests/data/test306 b/tests/data/test306
index ee887024116d3c2edd6cbb6c471ae17e823714a1..a7e477e4de5d65c67b1d5a77a5939e0707bb9bdf 100644 (file)
--- a/tests/data/test306
+++ b/tests/data/test306
@@ -42,10 +42,10 @@ SSL
 <server>
 https
 </server>
- <name>
+<name>
 HTTPS GET, receive no headers only data!
- </name>
- <command>
+</name>
+<command>
 -k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER --http0.9
 </command>
 </client>

diff --git a/tests/data/test307 b/tests/data/test307
index 4c004ae1cc4628dbe0b8947d4b0910b1366056e6..ce3232ac7fe55fe57939a88af8164e0579b88ae2 100644 (file)
--- a/tests/data/test307
+++ b/tests/data/test307
@@ -32,10 +32,10 @@ https
 perl %SRCDIR/libtest/test%TESTNUMBER.pl %CURL
 </precheck>
 
- <name>
+<name>
 simple HTTPS GET with openssl engine
- </name>
- <command>
+</name>
+<command>
 --engine openssl -k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test308 b/tests/data/test308
index 7534ed6ba0407c3fe03d30d8946f1b2252d0b811..39803d3b028445196e6bb7950df26e21d4092247 100644 (file)
--- a/tests/data/test308
+++ b/tests/data/test308
@@ -17,10 +17,10 @@ OpenSSL
 <server>
 https
 </server>
- <name>
+<name>
 simple HTTPS GET with invalid crypto engine
- </name>
- <command>
+</name>
+<command>
 --engine invalid-crypto-engine-xyzzy -k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test309 b/tests/data/test309
index 0a3b5296527f81da647cd04a670e603b809d5d9b..29b3e30619c4adb0b2658c5491936afc43bd1e0c 100644 (file)
--- a/tests/data/test309
+++ b/tests/data/test309
@@ -55,10 +55,10 @@ SSL
 http
 https
 </server>
- <name>
+<name>
 HTTP Location: redirect to HTTPS URL
- </name>
- <command>
+</name>
+<command>
 -k http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L
 </command>
 </client>

diff --git a/tests/data/test31 b/tests/data/test31
index d661f64e133e5a42f19aa3772a851e8e179fad0c..3ceaad0f94d791f0d5813970f6b449c68943cda2 100644 (file)
--- a/tests/data/test31
+++ b/tests/data/test31
@@ -132,16 +132,16 @@ boo
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with weirdly formatted cookies and cookiejar storage
- </name>
+</name>
 # Explicitly set the time zone to a known good one, in case the user is
 # using one of the 'right' zones that take into account leap seconds
 # which causes the cookie expiry times to be different.
 <setenv>
 TZ=GMT
 </setenv>
- <command>
+<command>
 http://test31.curl:%HTTPPORT/we/want/%TESTNUMBER -b none -c %LOGDIR/jar%TESTNUMBER.txt --resolve test31.curl:%HTTPPORT:127.0.0.1
 </command>
 <precheck>

diff --git a/tests/data/test310 b/tests/data/test310
index 6b6f63a66802fd1e985a6da20b1de0ddae23e7db..b9f1850ead86341e233e309ff17db8df6f4a3e06 100644 (file)
--- a/tests/data/test310
+++ b/tests/data/test310
@@ -30,10 +30,10 @@ SSL
 <server>
 https Server-localhost-sv.pem
 </server>
- <name>
+<name>
 simple HTTPS GET
- </name>
- <command>
+</name>
+<command>
 --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name

diff --git a/tests/data/test3102 b/tests/data/test3102
index 5d9bcf3854a5416ef4505eeb407ccd3912b5783a..4df7ba9c1f6cf2685fbb16f06e9e2cc7b83e2bd0 100644 (file)
--- a/tests/data/test3102
+++ b/tests/data/test3102
@@ -30,10 +30,10 @@ https
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 verify certificate chain order with simple HTTPS GET
- </name>
- <command>
+</name>
+<command>
 https://%HOSTIP:%HTTPSPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test311 b/tests/data/test311
index 0e05b63c0fae3c4bd62f2593e02f22319c0f67f3..a3f9ed0e27228472ef0efba4fdc37c1bfb4f8b1f 100644 (file)
--- a/tests/data/test311
+++ b/tests/data/test311
@@ -21,10 +21,10 @@ SSL
 <server>
 https Server-localhost0h-sv.pem
 </server>
- <name>
+<name>
 HTTPS wrong subjectAltName but right CN
- </name>
- <command>
+</name>
+<command>
 --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name

diff --git a/tests/data/test312 b/tests/data/test312
index f013a7cfd1f1f440743fc6fe7239a6c2a17ff9c7..c8c46b82146a54a755041ddb1b0f7d0168de412b 100644 (file)
--- a/tests/data/test312
+++ b/tests/data/test312
@@ -21,10 +21,10 @@ SSL
 <server>
 https Server-localhost.nn-sv.pem
 </server>
- <name>
+<name>
 HTTPS GET to localhost and null-prefixed CN cert
- </name>
- <command>
+</name>
+<command>
 --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name

diff --git a/tests/data/test313 b/tests/data/test313
index d87a464919375c7a9671d23f296f1ffd8c343c61..12f91f96598522dc5b5d3b9adf142f0b645ccd48 100644 (file)
--- a/tests/data/test313
+++ b/tests/data/test313
@@ -17,10 +17,10 @@ SSL
 <server>
 https Server-localhost-sv.pem
 </server>
- <name>
+<name>
 CRL test
- </name>
- <command>
+</name>
+<command>
 --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --crlfile %SRCDIR/certs/Server-localhost-sv.crl https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name

diff --git a/tests/data/test314 b/tests/data/test314
index cdc36af210a0647bba2deb44b8546466c1fbe381..d8e596bd46cf521156e1463a1d0254de415d4c42 100644 (file)
--- a/tests/data/test314
+++ b/tests/data/test314
@@ -170,10 +170,10 @@ brotli
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET brotli compressed content
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>

diff --git a/tests/data/test315 b/tests/data/test315
index 3073251e2bfd489905f2b45ad5b1da1d888f9884..fbadac63c9564c97cb858d26fa448ab514dcee30 100644 (file)
--- a/tests/data/test315
+++ b/tests/data/test315
@@ -60,10 +60,10 @@ brotli
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET brotli compressed content with broken header
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>

diff --git a/tests/data/test316 b/tests/data/test316
index be7de17be332d21173a931b3851ac5fa33cbbbdc..d2216ad06ae9d63e89dce411c6feb3bc139fefdb 100644 (file)
--- a/tests/data/test316
+++ b/tests/data/test316
@@ -170,10 +170,10 @@ brotli
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET brotli compressed content of size more than CURL_MAX_WRITE_SIZE
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>

diff --git a/tests/data/test317 b/tests/data/test317
index a8cfd6112e321f4c8f7218f58ae2be49b4b3ec05..10f0b881778911a7a151c8afda070d0872cb09ea 100644 (file)
--- a/tests/data/test317
+++ b/tests/data/test317
@@ -61,10 +61,10 @@ contents
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with custom Authorization: and redirect to new host
- </name>
- <command>
+</name>
+<command>
 http://first.host.it.is/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT -H "Authorization: s3cr3t" --proxy-user testing:this --location
 </command>
 <features>

diff --git a/tests/data/test318 b/tests/data/test318
index 94a53e8bcf78be200fc5dc5d3f82fdbfecb7f529..6577db5f925b890be50487014572fad6bff520c3 100644 (file)
--- a/tests/data/test318
+++ b/tests/data/test318
@@ -61,10 +61,10 @@ contents
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with custom Authorization: and redirect to new host
- </name>
- <command>
+</name>
+<command>
 http://first.host.it.is/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT -H "Authorization: s3cr3t" --proxy-user testing:this --location-trusted
 </command>
 <features>

diff --git a/tests/data/test319 b/tests/data/test319
index d2e35ea32b1691b4107e59e154ce3b0828514f3c..81ef747191d87e4ba54074314e0b895fadbfb943 100644 (file)
--- a/tests/data/test319
+++ b/tests/data/test319
@@ -34,9 +34,9 @@ libz
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET gzip transfer-encoded data in raw mode
- </name>
+</name>
  <command option="no-include">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --raw
  </command>

diff --git a/tests/data/test32 b/tests/data/test32
index d5762f4e205b5fcb80b13ce618639b1906957ca5..f613693041709de1231545229fc87bf65a05e01d 100644 (file)
--- a/tests/data/test32
+++ b/tests/data/test32
@@ -31,10 +31,10 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with -d and -G
- </name>
- <command>
+</name>
+<command>
 -d "foo=moo&moo=poo" http://%HOSTIP:%HTTPPORT/%TESTNUMBER -G
 </command>
 </client>

diff --git a/tests/data/test320 b/tests/data/test320
index 77f684b04b1cae0be462d174883705dd1806c8a0..edf74bc58557e3b1d6b95dc15e96efed4997e35f 100644 (file)
--- a/tests/data/test320
+++ b/tests/data/test320
@@ -46,9 +46,9 @@ httptls+srp
 <features>
 TLS-SRP
 </features>
- <name>
+<name>
 simple TLS-SRP HTTPS GET, check user in response
- </name>
+</name>
 <command>
 --insecure --tlsauthtype SRP --tlsuser jsmith --tlspassword abc -A curl-test-suite https://%HOSTIP:%HTTPTLSPORT
 </command>

diff --git a/tests/data/test3200 b/tests/data/test3200
index a2f9074019209d9f2e38d6c02b31de0b3cc53b36..b2206fef39267b3035afa46b7399d5fdb2a0c00b 100644 (file)
--- a/tests/data/test3200
+++ b/tests/data/test3200
@@ -15,9 +15,9 @@ none
 <features>
 unittest
 </features>
- <name>
+<name>
 curl_get_line unit tests
- </name>
+</name>
 <command>
 %LOGDIR/curl_get_line%TESTNUMBER
 </command>

diff --git a/tests/data/test3202 b/tests/data/test3202
index 52d62b2b72ca0739ca057809e95e369ad35b830f..25ec6073b4dfa5ad16b200fc36a3f008f253abdb 100644 (file)
--- a/tests/data/test3202
+++ b/tests/data/test3202
@@ -36,10 +36,10 @@ ipv6
 <server>
 http-ipv6
 </server>
- <name>
+<name>
 HTTP-IPv6 GET with PROXY protocol with spoofed client IP
- </name>
- <command>
+</name>
+<command>
 -g "http://%HOST6IP:%HTTP6PORT/%TESTNUMBER" --haproxy-clientip "2001:db8::"
 </command>
 <features>

diff --git a/tests/data/test321 b/tests/data/test321
index c6b208b2a21cbd52e4b98f04d3de697a5889e8d3..7d9395cc001b6a7d5b40ce2e441a0d0940f109f8 100644 (file)
--- a/tests/data/test321
+++ b/tests/data/test321
@@ -15,9 +15,9 @@ httptls+srp
 <features>
 TLS-SRP
 </features>
- <name>
+<name>
 TLS-SRP with bad username and password
- </name>
+</name>
 <command>
 --insecure --tlsauthtype SRP --tlsuser baduser --tlspassword badpass https://%HOSTIP:%HTTPTLSPORT
 </command>

diff --git a/tests/data/test322 b/tests/data/test322
index f7f82790fdaed464030d22c2b9feb0e3e0723d65..02cefba923740c079a2d800763c8c080437b6d79 100644 (file)
--- a/tests/data/test322
+++ b/tests/data/test322
@@ -15,9 +15,9 @@ httptls+srp
 <features>
 TLS-SRP
 </features>
- <name>
+<name>
 TLS-SRP with bad password
- </name>
+</name>
 <command>
 --insecure --tlsauthtype SRP --tlsuser jsmith --tlspassword badpass https://%HOSTIP:%HTTPTLSPORT
 </command>

diff --git a/tests/data/test323 b/tests/data/test323
index c46c02a3897fec83d923a8bc800103795d7515d0..72320a66e9498f8b2acccc0a02138d3708d6599c 100644 (file)
--- a/tests/data/test323
+++ b/tests/data/test323
@@ -15,9 +15,9 @@ https
 <features>
 TLS-SRP
 </features>
- <name>
+<name>
 TLS-SRP to non-TLS-SRP server
- </name>
+</name>
 <command>
 --insecure --tlsauthtype SRP --tlsuser jsmith --tlspassword badpass https://%HOSTIP:%HTTPSPORT/want/%TESTNUMBER
 </command>

diff --git a/tests/data/test324 b/tests/data/test324
index 159f36b8450b821e43b9579a92470622ec7800bc..aefd25e10037f9f84272c0fec653fedc6513b036 100644 (file)
--- a/tests/data/test324
+++ b/tests/data/test324
@@ -15,9 +15,9 @@ httptls+srp
 <features>
 TLS-SRP
 </features>
- <name>
+<name>
 TLS-SRP with server cert checking
- </name>
+</name>
 <command> # no --insecure
 --tlsauthtype SRP --tlsuser jsmith --tlspassword abc https://%HOSTIP:%HTTPTLSPORT/want/fails
 </command>

diff --git a/tests/data/test325 b/tests/data/test325
index 4bdf2aa31631d3e11a41cccb4fce8abed297af71..0baed5c04ab0636f95e05aec88a50cc248a364d7 100644 (file)
--- a/tests/data/test325
+++ b/tests/data/test325
@@ -38,10 +38,10 @@ SSL
 <server>
 https
 </server>
- <name>
+<name>
 HTTPS with attempted redirect to denied HTTP
- </name>
- <command>
+</name>
+<command>
 -k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER --proto-redir -http --location
 </command>
 </client>

diff --git a/tests/data/test326 b/tests/data/test326
index 56d4dcb3590733af0369bacfc19c99493edf893b..f2f25ef34cc7b37821c2b4b08447f8a34939aa35 100644 (file)
--- a/tests/data/test326
+++ b/tests/data/test326
@@ -45,9 +45,9 @@ line 1
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET chunked data in raw mode
- </name>
+</name>
  <command option="no-include">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --raw
  </command>

diff --git a/tests/data/test327 b/tests/data/test327
index c4a3bc511927936a3d62126fc63611eb570c1f44..6e86c3722b54f67c1394ad1e52146ccb25f584e1 100644 (file)
--- a/tests/data/test327
+++ b/tests/data/test327
@@ -39,10 +39,10 @@ Set-Cookie: foobar=name; expires=Thu, 01 Jan 1970 00:00:00 GMT;
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with cookiejar without cookies left
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b none -c %LOGDIR/cookies%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER0002
 </command>
 <features>

diff --git a/tests/data/test328 b/tests/data/test328
index f17af3cc90e162a884d610f08113c27659715ba0..cb891b044fa00247d1270f26af77d00c3024396b 100644 (file)
--- a/tests/data/test328
+++ b/tests/data/test328
@@ -31,10 +31,10 @@ http
 <features>
 libz
 </features>
- <name>
+<name>
 HTTP with "Content-Encoding: none
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/hello/%TESTNUMBER --compressed
 </command>
 </client>

diff --git a/tests/data/test329 b/tests/data/test329
index 35892a8564a124c7667731d2c58640fa217fd5aa..93135c5ec10593b81da81245729106327278cfa7 100644 (file)
--- a/tests/data/test329
+++ b/tests/data/test329
@@ -40,16 +40,16 @@ moo
 <server>
 http
 </server>
- <name>
+<name>
 HTTP cookie with Max-Age=0
- </name>
+</name>
 # Explicitly set the time zone to a known good one, in case the user is
 # using one of the 'right' zones that take into account leap seconds
 # which causes the cookie expiry times to be different.
 <setenv>
 TZ=GMT
 </setenv>
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b %LOGDIR/jar%TESTNUMBER.txt -b %LOGDIR/jar%TESTNUMBER-2.txt -H "Host: host.foo.com" http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER0002
 </command>
 <features>

diff --git a/tests/data/test33 b/tests/data/test33
index bd02e008853e9de055f56da79402f2778bf8cc24..34afff35b70553d6deccf43d8663d8ca15ea3554 100644 (file)
--- a/tests/data/test33
+++ b/tests/data/test33
@@ -20,9 +20,9 @@ HTTP/1.1 200 OK swsclose
 <server>
 http
 </server>
- <name>
+<name>
 HTTP PUT with resume
- </name>
+</name>
 <file name="%LOGDIR/test%TESTNUMBER.txt">
 012345678
 012345678
@@ -35,7 +35,7 @@ HTTP PUT with resume
 012345678
 012345678
 </file>
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T%LOGDIR/test%TESTNUMBER.txt -C 50
 </command>
 </client>

diff --git a/tests/data/test330 b/tests/data/test330
index d145fc07acfbca398229cf9868145f2ba6ba1e6b..4344e2d4b27a39ce4ce6fdbf050d3d9082e4a5b5 100644 (file)
--- a/tests/data/test330
+++ b/tests/data/test330
@@ -60,10 +60,10 @@ contents
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with custom Cookie: and redirect to new host
- </name>
- <command>
+</name>
+<command>
 http://first.host.it.is/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT -H "Cookie: test=yes" --location
 </command>
 <features>

diff --git a/tests/data/test331 b/tests/data/test331
index 34d9a78a68b6cd2826ff53495f8a02690dadd699..8ab268203f88a51d3541f82857875e6474981fe3 100644 (file)
--- a/tests/data/test331
+++ b/tests/data/test331
@@ -36,10 +36,10 @@ Funny-head: yesyes swsclose
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with cookie using host name 'moo'
- </name>
- <command>
+</name>
+<command>
 -x http://%HOSTIP:%HTTPPORT http://moo/we/want/%TESTNUMBER -b none http://moo/we/want/%TESTNUMBER0002
 </command>
 <features>

diff --git a/tests/data/test332 b/tests/data/test332
index 54763eda0e56d07f6bbe5a2998f52ce34f5befc0..e00f7723116e0bcf8ea1e8c797e2c37d9a1506b1 100644 (file)
--- a/tests/data/test332
+++ b/tests/data/test332
@@ -22,10 +22,10 @@ returned
 <server>
 tftp
 </server>
- <name>
+<name>
 TFTP retrieve with blksize 400
- </name>
- <command>
+</name>
+<command>
 tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER --tftp-blksize 400
 </command>
 </client>

diff --git a/tests/data/test333 b/tests/data/test333
index e0fc450d54aeeed8f28fb99dfa6c820e7b3882c5..8f048e6cbea671c71638991f26b41d018c47f46e 100644 (file)
--- a/tests/data/test333
+++ b/tests/data/test333
@@ -16,10 +16,10 @@ command-line
 <server>
 none
 </server>
- <name>
+<name>
 Try a non-boolean command line option with --no-
- </name>
- <command>
+</name>
+<command>
 --no-proxy "hey" http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test335 b/tests/data/test335
index 558d2ca77dfc16673cde8274b8bbb852eefb444f..a376f4018dd9c892e927da0d6b043c4341930896 100644 (file)
--- a/tests/data/test335
+++ b/tests/data/test335
@@ -63,10 +63,10 @@ http
 crypto
 proxy
 </features>
- <name>
+<name>
 HTTP with proxy Digest and site Digest with creds in URLs
- </name>
- <command>
+</name>
+<command>
 http://digest:alot@data.from.server.requiring.digest.hohoho.com/%TESTNUMBER --proxy http://foo:bar@%HOSTIP:%HTTPPORT --proxy-digest --digest
 </command>
 </client>

diff --git a/tests/data/test336 b/tests/data/test336
index 89e9bffc0d7b7f09fe5c55cfa549434564aa96ca..f50b42adb3320f83e4c4c9798c39f5bb0551da75 100644 (file)
--- a/tests/data/test336
+++ b/tests/data/test336
@@ -31,10 +31,10 @@ REPLY SIZE 500 no such command
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP range download when SIZE doesn't work
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --range 3-6
 </command>
 </client>

diff --git a/tests/data/test337 b/tests/data/test337
index f8ca6856e88297e6f18c22cfda274371b751ac22..d44a712fbbb7b57a320d878fa96a328477c43c29 100644 (file)
--- a/tests/data/test337
+++ b/tests/data/test337
@@ -31,10 +31,10 @@ REPLY SIZE 213 file: 213, Size =51
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP range download with SIZE returning extra crap
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --range 3-6
 </command>
 </client>

diff --git a/tests/data/test338 b/tests/data/test338
index 4de5970420b8c3466e186976de87a4ed13f2e085..d3acd5f098df7cc486a0355054f98374f6741b2e 100644 (file)
--- a/tests/data/test338
+++ b/tests/data/test338
@@ -34,10 +34,10 @@ connection-monitor
 <server>
 http
 </server>
- <name>
+<name>
 ANYAUTH connection reuse of non-authed connection
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --next http://%HOSTIP:%HTTPPORT/%TESTNUMBER --anyauth -u foo:moo
 </command>
 </client>

diff --git a/tests/data/test34 b/tests/data/test34
index 3119ce22a30b147a9db6974dcdf5bbf3d871adaf..5d81a5a8f7846b34f7a545ca6d94d1b84fe8f91b 100644 (file)
--- a/tests/data/test34
+++ b/tests/data/test34
@@ -41,10 +41,10 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbb
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with chunked Transfer-Encoding
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test340 b/tests/data/test340
index 6c15dc190fa9d97e741fe95e1e82eecc467b0d51..c003e42afa916e7cf720c591c39e2cd689b268c7 100644 (file)
--- a/tests/data/test340
+++ b/tests/data/test340
@@ -18,10 +18,10 @@ singlecwd
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP using %00 in path with singlecwd
- </name>
- <command>
+</name>
+<command>
 --ftp-method singlecwd ftp://%HOSTIP:%FTPPORT/%00first/second/third/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test348 b/tests/data/test348
index c9aa2cec495cd782f50d7ff490e0aae85a79f68c..55e9d608ddc8f0e3d8f520453b11728191a15297 100644 (file)
--- a/tests/data/test348
+++ b/tests/data/test348
@@ -18,9 +18,9 @@ STOR 552 disk full
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP upload file with 552 disk full response
- </name>
+</name>
 <file name="%LOGDIR/test%TESTNUMBER.txt">
 data
     to
@@ -29,7 +29,7 @@ that FTP
 works
   so does it?
 </file>
- <command>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt
 </command>
 </client>

diff --git a/tests/data/test349 b/tests/data/test349
index 7abd0579758080968cf27958776237ce1c87b0dd..c1106f2ac3caac8ffd2bac15e85eaa35cc733e65 100644 (file)
--- a/tests/data/test349
+++ b/tests/data/test349
@@ -21,10 +21,10 @@ This silly page doesn't reaaaaaly exist so you should not get it.
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET --fail-with-body on HTTP error return
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --fail-with-body
 </command>
 </client>

diff --git a/tests/data/test35 b/tests/data/test35
index 33e6eac73f71ea9faa3830c62498bb611d327a0e..a098769aab762554b774a1b54a20fd782c104578 100644 (file)
Binary files a/tests/data/test35 and b/tests/data/test35 differ

diff --git a/tests/data/test350 b/tests/data/test350
index 6cb53fa11f14f92dcaef3fa34f961a791a2a45d1..6830d704d0fcad5a9604f696f983405613850b62 100644 (file)
--- a/tests/data/test350
+++ b/tests/data/test350
@@ -32,10 +32,10 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP root dir list multicwd
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT// --ftp-method multicwd
 </command>
 </client>

diff --git a/tests/data/test351 b/tests/data/test351
index 219677f781473e600f4268e5b4ff9f6456a916e5..ef21364ad4be35dd9e3a4fb932eb8ac945d73d7d 100644 (file)
--- a/tests/data/test351
+++ b/tests/data/test351
@@ -32,10 +32,10 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP root dir list nocwd
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT// --ftp-method nocwd
 </command>
 </client>

diff --git a/tests/data/test352 b/tests/data/test352
index 5f498a23b7d442b68f06c8767b92db3d6ca33ae6..cfcdc1f10d3d6755c58648dbcd9dd7b74f50c71c 100644 (file)
--- a/tests/data/test352
+++ b/tests/data/test352
@@ -32,10 +32,10 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP root dir list singlecwd
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT// --ftp-method singlecwd
 </command>
 </client>

diff --git a/tests/data/test353 b/tests/data/test353
index 1adee379bdfb1c6a281585cad2e66d9555199365..26115d6753440fd65182cb80fb73f022e6d25e12 100644 (file)
--- a/tests/data/test353
+++ b/tests/data/test353
@@ -32,10 +32,10 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP home dir list singlecwd
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/ --ftp-method singlecwd
 </command>
 </client>

diff --git a/tests/data/test354 b/tests/data/test354
index cdd82705189053ac1ab47de1655dc82ef11b052e..dc6d732d8ba281ff39e66c5837bbfd81692c793c 100644 (file)
--- a/tests/data/test354
+++ b/tests/data/test354
@@ -26,10 +26,10 @@ REPLY USER 200 fine, proceed without password
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP without password
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 

diff --git a/tests/data/test355 b/tests/data/test355
index 8b32c92e7864f39db16c47d75df416e4b4967fca..67f7777ff504236a4c19d63bad6d5ae791456381 100644 (file)
--- a/tests/data/test355
+++ b/tests/data/test355
@@ -30,10 +30,10 @@ alt-svc
 <server>
 http
 </server>
- <name>
+<name>
 load Alt-Svc from file and use
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --alt-svc ""
 </command>
 <file name="%LOGDIR/altsvc-%TESTNUMBER">

diff --git a/tests/data/test356 b/tests/data/test356
index 2597f15e88b72b1742b0b82f84d884f7d36e30c4..3fb001c58f9a6f26e6cb72146a8a1aa98f47539d 100644 (file)
--- a/tests/data/test356
+++ b/tests/data/test356
@@ -35,14 +35,14 @@ alt-svc
 <server>
 http
 </server>
- <name>
+<name>
 parse incoming Alt-Svc and save to file
- </name>
+</name>
 <setenv>
 # make debug-curl accept Alt-Svc over plain HTTP
 CURL_ALTSVC_HTTP="yeah"
 </setenv>
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --alt-svc "%LOGDIR/altsvc-%TESTNUMBER"
 </command>
 </client>

diff --git a/tests/data/test357 b/tests/data/test357
index 5d1f456a3b08a45d0a8d2075b613dee4fcbf6161..fcd4b96446f0b4b2b89815e53bb9b8864d5148e7 100644 (file)
--- a/tests/data/test357
+++ b/tests/data/test357
@@ -47,10 +47,10 @@ no-expect
 <server>
 http
 </server>
- <name>
+<name>
 HTTP PUT with Expect: 100-continue and 417 response
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt --expect100-timeout 999
 </command>
 # 1053700 x 'x', large enough to invoke the 100-continue behaviour

diff --git a/tests/data/test358 b/tests/data/test358
index 47afc582cbbd84c334089f88d065240dab947d8d..5df596de0c8e261d08d9003af7133f5fc7992b7d 100644 (file)
--- a/tests/data/test358
+++ b/tests/data/test358
@@ -36,14 +36,14 @@ h2c
 http
 http/2
 </server>
- <name>
+<name>
 HTTPS GET translated by alt-svc lookup to HTTP/2 GET
- </name>
+</name>
 <setenv>
 # make debug-curl accept Alt-Svc over plain HTTP
 CURL_ALTSVC_HTTP="yeah"
 </setenv>
- <command>
+<command>
 --http2 --alt-svc "%LOGDIR/altsvc-%TESTNUMBER" "http://%HOSTIP:%HTTPPORT/%TESTNUMBER" "http://%HOSTIP:%HTTPPORT/%TESTNUMBER"
 </command>
 <file name="%LOGDIR/altsvc-%TESTNUMBER">

diff --git a/tests/data/test359 b/tests/data/test359
index 9b466b773274b5ff04c392cc27d40a7811c1483e..117b4defe39bb475a71163da5c5dfa72eb9a3cba 100644 (file)
--- a/tests/data/test359
+++ b/tests/data/test359
@@ -36,14 +36,14 @@ h2c
 https
 http/2
 </server>
- <name>
+<name>
 HTTPS GET translated by alt-svc lookup to HTTP/2 GET
- </name>
+</name>
 <setenv>
 # make debug-curl accept Alt-Svc over plain HTTP
 CURL_ALTSVC_HTTP="yeah"
 </setenv>
- <command>
+<command>
 --http2 --alt-svc "%LOGDIR/altsvc-%TESTNUMBER" "http://%HOSTIP:%HTTPSPORT/%TESTNUMBER" "http://%HOSTIP:%HTTPSPORT/%TESTNUMBER"
 </command>
 <file name="%LOGDIR/altsvc-%TESTNUMBER">

diff --git a/tests/data/test36 b/tests/data/test36
index fb4c885eb26c282107e307194070acbb9e6117f2..1f055726bce82c8b3ab7315921be87b2868fc525 100644 (file)
--- a/tests/data/test36
+++ b/tests/data/test36
@@ -38,10 +38,10 @@ a
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with bad chunked Transfer-Encoding
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test360 b/tests/data/test360
index e67c847ed5a5aae902bfd0e3fae5e370bd030663..b7d570d7b6c4359766429a5624eb8d04e2cc6d0b 100644 (file)
--- a/tests/data/test360
+++ b/tests/data/test360
@@ -11,10 +11,10 @@
 <server>
 http
 </server>
- <name>
+<name>
 Error on both --fail-with-body and --fail
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --fail-with-body --fail
 </command>
 </client>

diff --git a/tests/data/test361 b/tests/data/test361
index ec135866a935f73d7285f9abf2648da5a714db0e..4fbf3d5ea24efbebe34d08f0f57ad8501e7f89fe 100644 (file)
--- a/tests/data/test361
+++ b/tests/data/test361
@@ -21,10 +21,10 @@ This silly page doesn't reaaaaaly exist so you should not get it.
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET --fail-with-body on HTTP error return - twice
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER --fail-with-body
 </command>
 </client>

diff --git a/tests/data/test362 b/tests/data/test362
index 900761931028444da51250bc1c2ac14ed20764f6..e8ce9731ed83b8f041955c88efcf6e0eda3fb801 100644 (file)
--- a/tests/data/test362
+++ b/tests/data/test362
@@ -12,9 +12,9 @@ STOR
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP resume upload file with nothing to start from
- </name>
+</name>
 <file name="%LOGDIR/test%TESTNUMBER.txt">
 data
     to
@@ -23,7 +23,7 @@ that FTP
 works
   so does it?
 </file>
- <command>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt --continue-at -
 </command>
 </client>

diff --git a/tests/data/test363 b/tests/data/test363
index 24179171a6e185afd21d2e189114ee16a3a724f7..7cc7dad991736d266196eb45ed86fe9c603fc792 100644 (file)
--- a/tests/data/test363
+++ b/tests/data/test363
@@ -50,16 +50,16 @@ proxy
 http
 http-proxy
 </server>
- <name>
+<name>
 CONNECT with short sends
- </name>
+</name>
 <setenv>
 # make the first send cut off after this amount of data
 CURL_SMALLREQSEND=8
 # make repeated sends small too
 CURL_SMALLSENDS=8
 </setenv>
- <command>
+<command>
 http://test.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER -p -x %HOSTIP:%PROXYPORT -d "datatopost=ohthatsfunyesyes"
 </command>
 </client>

diff --git a/tests/data/test364 b/tests/data/test364
index 627bc3170b955f513d6b747ee74cabf8d7cc8e5a..0e2ccd15147dc62d5f46774be16a2544fa0355af 100644 (file)
--- a/tests/data/test364
+++ b/tests/data/test364
@@ -24,10 +24,10 @@ SSL
 <server>
 https
 </server>
- <name>
+<name>
 HTTPS PUT of small file
- </name>
- <command>
+</name>
+<command>
 -k https://%HOSTIP:%HTTPSPORT/we/want/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt
 </command>
 <file name="%LOGDIR/test%TESTNUMBER.txt">

diff --git a/tests/data/test365 b/tests/data/test365
index add760f6c77235477055fe8481239fc1821dca36..05ab8faa36e6b92ef8ffe39e9b7e53f24cbf2425 100644 (file)
--- a/tests/data/test365
+++ b/tests/data/test365
@@ -43,10 +43,10 @@ chunked data fun
 <server>
 http
 </server>
- <name>
+<name>
 HTTP/1.1 with chunked AND Content-Length headers
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test366 b/tests/data/test366
index 46a4b502a83f0f34109134b87360e5d8aa1bbe66..d2193ff14a5cc5eef1e9132ea9dffcf1f37088dc 100644 (file)
--- a/tests/data/test366
+++ b/tests/data/test366
@@ -26,10 +26,10 @@ server not available
 <server>
 http
 </server>
- <name>
+<name>
 HTTP --retry-max-time with too long Retry-After
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --retry 2 --retry-max-time 10
 </command>
 </client>

diff --git a/tests/data/test368 b/tests/data/test368
index 505ce34ea9a92085c761342927ad12059be8d364..69b63e94f6c6a3c49743a2cb880635116043920a 100644 (file)
--- a/tests/data/test368
+++ b/tests/data/test368
@@ -26,10 +26,10 @@ Connection: close
 <server>
 http
 </server>
- <name>
+<name>
 Append dash if -r range specified without one
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -r 4
 </command>
 </client>

diff --git a/tests/data/test37 b/tests/data/test37
index f8798596294afcdda7f68407a240e108e397845f..d5e79824c6e20d1c42fe639923b7c0f3c3ee343b 100644 (file)
--- a/tests/data/test37
+++ b/tests/data/test37
@@ -19,10 +19,10 @@ FAILURE
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with nothing returned from server
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test371 b/tests/data/test371
index 83ea5c73bab30b76e4f7f7ddc1b371986df398f1..b58237f359605d29564689fd137df5981a8a900f 100644 (file)
--- a/tests/data/test371
+++ b/tests/data/test371
@@ -31,10 +31,10 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 using more -o than URLs in the command line
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/dump -o %LOGDIR/dump2 --no-progress-meter
 </command>
 </client>

diff --git a/tests/data/test376 b/tests/data/test376
index 8d15ec092851e4a32eedbdf2d78e9ec9df6650e6..991077caf7f2fbed2872341b032fa0336ffaf327 100644 (file)
--- a/tests/data/test376
+++ b/tests/data/test376
@@ -31,9 +31,9 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 --remove-on-error
- </name>
+</name>
  <command option="no-output">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/save-%TESTNUMBER --remove-on-error
 </command>

diff --git a/tests/data/test378 b/tests/data/test378
index ca908b7aa04e2984ec9e979fc522a4a728a684f4..ef77225be276446c3f277eec9b7a82afee38d667 100644 (file)
--- a/tests/data/test378
+++ b/tests/data/test378
@@ -17,10 +17,10 @@ HTTP POST
 <server>
 none
 </server>
- <name>
+<name>
 Reject using -T and -d at once
- </name>
- <command>
+</name>
+<command>
 -T %LOGDIR/%TESTNUMBER -d input http://never-accessed
 </command>
 </client>

diff --git a/tests/data/test379 b/tests/data/test379
index 491d815c081eadb6e0c76facf0d6edf18cdfcc8d..964cbdf0550ace5b9acaffcb6191cb0b5d9aedcf 100644 (file)
--- a/tests/data/test379
+++ b/tests/data/test379
@@ -34,9 +34,9 @@ exists before command runs
 <server>
 http
 </server>
- <name>
+<name>
 --remove-on-error with --no-clobber and an added number
- </name>
+</name>
  <command option="no-output">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/save --remove-on-error --no-clobber
 </command>

diff --git a/tests/data/test38 b/tests/data/test38
index da352d75d6216fa92e441a189c5b78b2931a3b60..abd2d3e362ae49f90122a1fb49670f52db712fe1 100644 (file)
--- a/tests/data/test38
+++ b/tests/data/test38
@@ -24,9 +24,9 @@ todelooooo lalalala yada yada, we know nothing about ranges ;-)
 <server>
 http
 </server>
- <name>
+<name>
 HTTP resume request without server supporting it
- </name>
+</name>
  <command option="no-output">
 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -C - --no-include -o %LOGDIR/fewl%TESTNUMBER.txt
 </command>

diff --git a/tests/data/test383 b/tests/data/test383
index 6ba8f5e2db19702a72f9a85fdea519ff8d628b00..bb8cb666d15d72129ade599c5cbae2e0dcd4e57c 100644 (file)
--- a/tests/data/test383
+++ b/tests/data/test383
@@ -31,10 +31,10 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with --json
- </name>
- <command>
+</name>
+<command>
 --json '{ "drink": "coffe" }' http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test384 b/tests/data/test384
index 9651f9f956e6d73e83bacf0bbc0961c3cadb6d48..6148ef40d411c5c0f8327cb42235bf438fbdeed4 100644 (file)
--- a/tests/data/test384
+++ b/tests/data/test384
@@ -31,9 +31,9 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with --json from stdin
- </name>
+</name>
 <stdin>
 { "drink": "coffe" }
 </stdin>

diff --git a/tests/data/test385 b/tests/data/test385
index ee543fa64fb634421498efbe6ecd527052561781..b2e3c4d8c0dbbf4276674d669809d0087a11d73d 100644 (file)
--- a/tests/data/test385
+++ b/tests/data/test385
@@ -31,10 +31,10 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with --json x 2
- </name>
- <command>
+</name>
+<command>
 --json '{ "drink": "coffe",' --json ' "crunch": "cookie" }' http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H "Content-Type: drinks/hot"
 </command>
 </client>

diff --git a/tests/data/test386 b/tests/data/test386
index 5e2fd6adfe22273438b1e00fb418eea4623cc2fa..ed20f5e4538294f28d6830146c7963d054e24b64 100644 (file)
--- a/tests/data/test386
+++ b/tests/data/test386
@@ -45,10 +45,10 @@ hello
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with --json + --next
- </name>
- <command>
+</name>
+<command>
 --json '{ "drink": "coffe" }' http://%HOSTIP:%HTTPPORT/%TESTNUMBER --next http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002
 </command>
 </client>

diff --git a/tests/data/test388 b/tests/data/test388
index 3a0214a0b7fefd5fbab048982ad0bb8837f0d82e..300c88f754804b501c2875fc9e33e071dfc06d9d 100644 (file)
--- a/tests/data/test388
+++ b/tests/data/test388
@@ -77,10 +77,10 @@ http
 !SSPI
 crypto
 </features>
- <name>
+<name>
 HTTP with Digest and multiple qop values with leading space
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -u testuser:testpass --digest http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002
 </command>
 </client>

diff --git a/tests/data/test389 b/tests/data/test389
index f805bc2770ef69bc9e98a64804015ea995fea064..fcb29f5b8c446fb8fefd29e6b88954856edbfee7 100644 (file)
--- a/tests/data/test389
+++ b/tests/data/test389
@@ -31,10 +31,10 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 *.localhost is a local host
- </name>
- <command>
+</name>
+<command>
 http://curlmachine.localhost:%HTTPPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost

diff --git a/tests/data/test39 b/tests/data/test39
index 36fafd7fadccec74caec19df5b6a70744dc2b9c0..1829617499f7cb995dabb906628b7346096ff1cf 100644 (file)
--- a/tests/data/test39
+++ b/tests/data/test39
@@ -25,10 +25,10 @@ Mime
 <server>
 http
 </server>
- <name>
+<name>
 HTTP RFC1867-type formposting with filename= and type=
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F name=daniel -F tool=curl --form-string "str1=@literal" --form-string "str2=<verbatim;type=xxx/yyy" -F "file=@%LOGDIR/test%TESTNUMBER.txt;type=moo/foobar;filename=fakerfile" -F file2=@%LOGDIR/test%TESTNUMBER.txt -F "file3=@\"%LOGDIR/test%TESTNUMBER.txt\";type=mo/foo;filename=\"f\\\\\\\\ak\\\\\\er,\\\\an\\d;.t\\\"xt\"" -F 'file4=@"%LOGDIR/test%TESTNUMBER.txt"; filename="A\\AA\"\"\\\"ZZZ"'
 </command>
 # We create this file before the command is invoked!

diff --git a/tests/data/test391 b/tests/data/test391
index 1eff2ef3eb133b9ba9fa02b96faaaee466479c5d..24428a08f0f2a9048cb939f14fc25e476ab863ad 100644 (file)
--- a/tests/data/test391
+++ b/tests/data/test391
@@ -45,10 +45,10 @@ Content-Type: text/html
 <server>
 http
 </server>
- <name>
+<name>
 --path-as-is with redirect, keeping dotdots
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/../../%TESTNUMBER --path-as-is -L
 </command>
 </client>

diff --git a/tests/data/test392 b/tests/data/test392
index 71d4486e225cce1e491ac45450ec78e28918a205..5c1076c82bbbea0003b942015744dac7fc8f15cd 100644 (file)
--- a/tests/data/test392
+++ b/tests/data/test392
@@ -27,14 +27,14 @@ boo
 <server>
 http
 </server>
- <name>
+<name>
 HTTP secure cookies over localhost
- </name>
+</name>
 
 <setenv>
 TZ=GMT
 </setenv>
- <command>
+<command>
 http://localhost:%HTTPPORT/%TESTNUMBER -b none http://localhost:%HTTPPORT/%TESTNUMBER
 </command>
 <precheck>

diff --git a/tests/data/test393 b/tests/data/test393
index 797b4f1eb69db6cd01a7538338e1543e755324d3..0cbbf2d2dcbbb4666a7c8f3de6a4106fe7fc962b 100644 (file)
--- a/tests/data/test393
+++ b/tests/data/test393
@@ -37,10 +37,10 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 HTTP max-filesize and out-of-range Content-Length
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --max-filesize 2000000
 </command>
 </client>

diff --git a/tests/data/test394 b/tests/data/test394
index 9d2779d8970eca4626bb68adf1b25d72145a8814..2154297d2f1f8fcbbf9442cae688e9c6198d4ad6 100644 (file)
--- a/tests/data/test394
+++ b/tests/data/test394
@@ -32,10 +32,10 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with rubbish in Content-Length
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test395 b/tests/data/test395
index 541b66b5089bdc13230fcbc47530e28aa32ba163..9bdb2e24a61c4881f1cfd3912c4ab3693e63384f 100644 (file)
--- a/tests/data/test395
+++ b/tests/data/test395
@@ -31,10 +31,10 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 HTTP and out-of-range Content-Length
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test396 b/tests/data/test396
index 11dd1a901ea988dd1d0db956d311847a2069e72c..4454184ea1983f789f2f0541ad863853de38eb8c 100644 (file)
--- a/tests/data/test396
+++ b/tests/data/test396
@@ -174,10 +174,10 @@ zstd
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET zstd compressed content
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>

diff --git a/tests/data/test397 b/tests/data/test397
index 4ad130a76b306043675dc80155bd1c7d199e78e4..956bb83e6d0c768e838ef2aa4bce814915f9bdcc 100644 (file)
--- a/tests/data/test397
+++ b/tests/data/test397
@@ -170,10 +170,10 @@ zstd
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET zstd compressed content of size more than CURL_MAX_WRITE_SIZE
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>

diff --git a/tests/data/test398 b/tests/data/test398
index b949064d29c62c4ba73a1a4ee38f5894d231062c..227478b5b5dce89ad7f1abe7e556191fa4072e9d 100644 (file)
--- a/tests/data/test398
+++ b/tests/data/test398
@@ -35,10 +35,10 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 <server>
 http
 </server>
- <name>
+<name>
 Reject HTTP/1.1 response with colon-less header
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test4 b/tests/data/test4
index c0b4f05d33aff516b607590b9b1b9867407c39ea..58e1650b0739c88e0780434bd712712c3d277c68 100644 (file)
--- a/tests/data/test4
+++ b/tests/data/test4
@@ -26,10 +26,10 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 Replaced internal and added custom HTTP headers
- </name>
- <command>
+</name>
+<command>
  -H "extra-header: here" -H "Accept: replaced" -H "X-Custom-Header;" -H "X-Test: foo; " -H "X-Test:" -H "X-Test2: foo;" -H "X-Test3:  " -H "X-Test4;  " -H "X-Test5;ignored" http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test40 b/tests/data/test40
index ad437d07def0aca2d1d95ad33151396ba76bac91..3f5695658399a0df3d5de144282a2134ed96d142 100644 (file)
--- a/tests/data/test40
+++ b/tests/data/test40
@@ -49,10 +49,10 @@ body
 <server>
 http
 </server>
- <name>
+<name>
 HTTP redirect with whitespace after ? (and conversion)
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
 </command>
 </client>

diff --git a/tests/data/test400 b/tests/data/test400
index f2d3263821f43da8304ce705fbcb549985c6fe9d..db774bf1203df486bf3783877edd2422be5dd47f 100644 (file)
--- a/tests/data/test400
+++ b/tests/data/test400
@@ -36,10 +36,10 @@ SSL
 <server>
 ftps
 </server>
- <name>
+<name>
 FTPS dir list PASV unencrypted data
- </name>
- <command>
+</name>
+<command>
 -k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/
 </command>
 </client>

diff --git a/tests/data/test401 b/tests/data/test401
index 043b660e68d00f5cb05ce2342cd18a1d01710382..5124447d841e6ff24379341e72cde126a810e477 100644 (file)
--- a/tests/data/test401
+++ b/tests/data/test401
@@ -16,9 +16,9 @@ SSL
 <server>
 ftps
 </server>
- <name>
+<name>
 FTPS PASV upload file
- </name>
+</name>
 <file name="%LOGDIR/test%TESTNUMBER.txt">
 data
     to
@@ -27,7 +27,7 @@ that FTPS
 works
   so does it?
 </file>
- <command>
+<command>
 -k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt
 </command>
 </client>

diff --git a/tests/data/test402 b/tests/data/test402
index 5c7bc678e288e02a21eb77daca714197487c744c..86283749a4dbeea0f42caf9a9313d857a8cde9e5 100644 (file)
--- a/tests/data/test402
+++ b/tests/data/test402
@@ -15,10 +15,10 @@ SSL
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP SSL required on non-SSL server
- </name>
- <command>
+</name>
+<command>
 -k --ftp-ssl-reqd ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test403 b/tests/data/test403
index 7e4d2bff501272b767fc46597084568ae0bd7f7b..7c2904afbeb21c9b88d48415a34f0af8a38ea68e 100644 (file)
--- a/tests/data/test403
+++ b/tests/data/test403
@@ -38,10 +38,10 @@ SSL
 <server>
 ftps
 </server>
- <name>
+<name>
 FTPS with CCC not supported by server
- </name>
- <command>
+</name>
+<command>
 -k --ftp-ssl-control --ftp-ssl-ccc ftps://%HOSTIP:%FTPSPORT/
 </command>
 </client>

diff --git a/tests/data/test404 b/tests/data/test404
index 0f73325ebea2ceef35a6704a516e325a538658bd..8461abfc004a7337e492a7c8137d7ad24ea3439d 100644 (file)
--- a/tests/data/test404
+++ b/tests/data/test404
@@ -15,10 +15,10 @@ SSL
 <server>
 ftps
 </server>
- <name>
+<name>
 FTPS with invalid cacert
- </name>
- <command>
+</name>
+<command>
 --ftp-ssl-control --cacert moooo ftps://%HOSTIP:%FTPSPORT/
 </command>
 </client>

diff --git a/tests/data/test405 b/tests/data/test405
index fc291d1ab8124ce965b1866fe690fc6ac918adef..90369b8ade0bc09b1074bb05c5924fde67d0acdd 100644 (file)
--- a/tests/data/test405
+++ b/tests/data/test405
@@ -15,10 +15,10 @@ SSL
 <server>
 ftp
 </server>
- <name>
+<name>
 FTPS operation to FTP port
- </name>
- <command>
+</name>
+<command>
 -m 5 -k ftps://%HOSTIP:%FTPPORT/path/to/file/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test406 b/tests/data/test406
index 01d83dc95beb010f855746849345a1c47d58623f..eca49d0d37030a7d085fa29746fe6d498a64c3c3 100644 (file)
--- a/tests/data/test406
+++ b/tests/data/test406
@@ -36,10 +36,10 @@ SSL
 <server>
 ftps
 </server>
- <name>
+<name>
 FTPS dir list, PORT with specified IP
- </name>
- <command>
+</name>
+<command>
 -k --ftp-ssl-control -P %CLIENTIP ftps://%HOSTIP:%FTPSPORT/
 </command>
 </client>

diff --git a/tests/data/test407 b/tests/data/test407
index 4f2591e9810fbda44a93b346f8d42dd788e791d9..8b35a9f2b3218f003fa59bd9cb07b079b4300365 100644 (file)
--- a/tests/data/test407
+++ b/tests/data/test407
@@ -25,10 +25,10 @@ SSL
 <server>
 ftps
 </server>
- <name>
+<name>
 Get two FTPS files from the same remote dir: no second CWD
- </name>
- <command>
+</name>
+<command>
 -k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/a/path/%TESTNUMBER ftps://%HOSTIP:%FTPSPORT/a/path/%TESTNUMBER
 </command>
 <stdout>

diff --git a/tests/data/test408 b/tests/data/test408
index 676ec9d81bf44a2e2d020c63c892d80df5bb15e2..594eb01aa73863c571b57537812b96cd238b2e2f 100644 (file)
--- a/tests/data/test408
+++ b/tests/data/test408
@@ -21,10 +21,10 @@ SSL
 <server>
 ftps
 </server>
- <name>
+<name>
 FTPS PORT upload with CWD
- </name>
- <command>
+</name>
+<command>
 -k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/CWD/STOR/RETR/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -P -
 </command>
 <file name="%LOGDIR/upload%TESTNUMBER">

diff --git a/tests/data/test409 b/tests/data/test409
index 4160a11ab7f76466c1f1566131c534ac0c2ac9e5..a1f902933238535c73fb9e6746abf27a59414547 100644 (file)
--- a/tests/data/test409
+++ b/tests/data/test409
@@ -16,9 +16,9 @@ SSL
 <server>
 ftps
 </server>
- <name>
+<name>
 FTPS PASV upload file
- </name>
+</name>
 <file name="%LOGDIR/test%TESTNUMBER.txt">
 data
     to
@@ -27,7 +27,7 @@ that FTP
 works
   so does it?
 </file>
- <command>
+<command>
 -k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt
 </command>
 </client>

diff --git a/tests/data/test41 b/tests/data/test41
index 7a133307d1452b4de603743c2ca5dcabb980557c..4e5fa84ad9b283029deb44da61e7c250b0299a81 100644 (file)
--- a/tests/data/test41
+++ b/tests/data/test41
@@ -18,10 +18,10 @@ Mime
 <server>
 http
 </server>
- <name>
+<name>
 HTTP formpost with missing file
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -F moo=@boo
 </command>
 </client>

diff --git a/tests/data/test410 b/tests/data/test410
index 4fec0b731d49cd479522faf5ffe55919367d8a8e..79d12def6838a3e188ecd975d6f7a4368c901447 100644 (file)
--- a/tests/data/test410
+++ b/tests/data/test410
@@ -28,14 +28,14 @@ SSL
 <server>
 https
 </server>
- <name>
+<name>
 HTTPS GET with very long request header
- </name>
+</name>
 # 14 characters repeated 3500 times makes 49000 bytes
 <file name="%LOGDIR/file%TESTNUMBER">
 Long: %repeat[3500 x header content]%
 </file>
- <command>
+<command>
 -k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER -H @%LOGDIR/file%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test411 b/tests/data/test411
index eb6fad1bc60fb76bccb2001dd7ee4321cfcd15d1..cdfdd46b41ca73f27e03b8cd60d9a56d58d794cb 100644 (file)
--- a/tests/data/test411
+++ b/tests/data/test411
@@ -16,10 +16,10 @@
 <server>
 none
 </server>
- <name>
+<name>
 -K with missing file causes error
- </name>
- <command>
+</name>
+<command>
 -K %LOGDIR/missing http://localhost
 </command>
 </client>

diff --git a/tests/data/test412 b/tests/data/test412
index 3f740f168937fc2c8c1a77e51e29d315da45ee8a..de607baa22d854142893ba55e90498ebd32b4564 100644 (file)
--- a/tests/data/test412
+++ b/tests/data/test412
@@ -33,14 +33,14 @@ debug
 <server>
 http
 </server>
- <name>
+<name>
 alt-svc using host name with trailing dot in URL
- </name>
+</name>
 <setenv>
 # make debug-curl accept Alt-Svc over plain HTTP
 CURL_ALTSVC_HTTP="yeah"
 </setenv>
- <command>
+<command>
 --alt-svc "%LOGDIR/altsvc-%TESTNUMBER" "http://whohoo.:12345/%TESTNUMBER"
 </command>
 <file name="%LOGDIR/altsvc-%TESTNUMBER">

diff --git a/tests/data/test413 b/tests/data/test413
index cfb7a729765623461f8bebfc1b56e9db23e5582e..8639306e0c4442b83b4b48d15c869985b5aa3f99 100644 (file)
--- a/tests/data/test413
+++ b/tests/data/test413
@@ -33,14 +33,14 @@ debug
 <server>
 http
 </server>
- <name>
+<name>
 alt-svc using host name with trailing dot on host from file
- </name>
+</name>
 <setenv>
 # make debug-curl accept Alt-Svc over plain HTTP
 CURL_ALTSVC_HTTP="yeah"
 </setenv>
- <command>
+<command>
 --alt-svc "%LOGDIR/altsvc-%TESTNUMBER" "http://whohoo:12345/%TESTNUMBER"
 </command>
 <file name="%LOGDIR/altsvc-%TESTNUMBER">

diff --git a/tests/data/test415 b/tests/data/test415
index 099ec830bf5d0bb1456a510134739ef3c84ef435..08d60482d27d54985166b958ee733121db40ff75 100644 (file)
--- a/tests/data/test415
+++ b/tests/data/test415
@@ -33,10 +33,10 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 <server>
 http
 </server>
- <name>
+<name>
 HTTP response with control code then negative Content-Length
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test416 b/tests/data/test416
index 93dc067f2cdf6603fdedc938a5e1d3e055179c0e..b6b10b3df2c00dddc211d5680a89bd2047b22d73 100644 (file)
--- a/tests/data/test416
+++ b/tests/data/test416
@@ -28,10 +28,10 @@ RETRSIZE 7
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP growing file support
- </name>
- <command>
+</name>
+<command>
 --ignore-content-length ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test419 b/tests/data/test419
index 35e12597fe77390c8dfb58de3ced11841cd290bf..f8ec82522b1a3348e47cce404d8144eb2a4e18ca 100644 (file)
--- a/tests/data/test419
+++ b/tests/data/test419
@@ -17,10 +17,10 @@ failure
 <server>
 http
 </server>
- <name>
+<name>
 --dump-header to file that cannot be created
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D loggg/save-here/fails
 </command>
 </client>

diff --git a/tests/data/test42 b/tests/data/test42
index 835f18185e23e39d164b6cab145a5eda9de0459f..50e501806694166cad964d09d8ab88d8d094fdfb 100644 (file)
--- a/tests/data/test42
+++ b/tests/data/test42
@@ -49,10 +49,10 @@ body
 <server>
 http
 </server>
- <name>
+<name>
 HTTP redirect with whitespace in path (and conversion)
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
 </command>
 </client>

diff --git a/tests/data/test420 b/tests/data/test420
index 7b7ecb437ee0e0f4d72f4ca8789b581558c37e7b..c635264da7f9aa6a7ec979b69813b8161b7ae52f 100644 (file)
--- a/tests/data/test420
+++ b/tests/data/test420
@@ -33,10 +33,10 @@ Set-Cookie: mycookie1=; Path=/; Max-Age=-1; Expires=Thu, 01 Jan 1970 00:00:00 GM
 <server>
 http
 </server>
- <name>
+<name>
 Setting cookies set with expired dates that were loaded from jar
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/func_test/del_cookie -b %LOGDIR/cookie%TESTNUMBER -c %LOGDIR/save%TESTNUMBER
 </command>
 <file name="%LOGDIR/cookie%TESTNUMBER" mode="text">

diff --git a/tests/data/test425 b/tests/data/test425
index dff6ab4a8f31b355e1bb236a44272e044707ee12..399ca1983f8c8d5165d255051e64b1bacd46fc4d 100644 (file)
--- a/tests/data/test425
+++ b/tests/data/test425
@@ -26,10 +26,10 @@ Content-Type: text/html
 <server>
 http
 </server>
- <name>
+<name>
 HTTP PUT with path ending with slash + query
- </name>
- <command>
+</name>
+<command>
 -T %LOGDIR/up%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER/?fullpath
 </command>
 <file name="%LOGDIR/up%TESTNUMBER">

diff --git a/tests/data/test43 b/tests/data/test43
index 4e7408be139cf7b20a7d5664f2b19afcf4c23a93..1c36f1c60c678b1993b6ebe3aae48840371829ba 100644 (file)
--- a/tests/data/test43
+++ b/tests/data/test43
@@ -50,10 +50,10 @@ If this is received, the location following worked
 <server>
 http
 </server>
- <name>
+<name>
 HTTP Location: following over HTTP proxy
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -x %HOSTIP:%HTTPPORT
 </command>
 <features>

diff --git a/tests/data/test430 b/tests/data/test430
index 3826f1556f3ad58d08abd7256869db5f65373dc6..377c2d48b9d2dad072f80976a642d1cd7b2039d0 100644 (file)
--- a/tests/data/test430
+++ b/tests/data/test430
@@ -59,10 +59,10 @@ data = "c"
 <server>
 http
 </server>
- <name>
+<name>
 Three -K uses with --next and --data in each
- </name>
- <command>
+</name>
+<command>
 -K %LOGDIR/config%TESTNUMBER-a -K %LOGDIR/config%TESTNUMBER-b -K %LOGDIR/config%TESTNUMBER-c
 </command>
 </client>

diff --git a/tests/data/test431 b/tests/data/test431
index 52c39d1bad576703f65bd1367c83c9d98af79826..9622d64e1d265580451ad9dbb6f45fe81e9ae91a 100644 (file)
--- a/tests/data/test431
+++ b/tests/data/test431
@@ -53,10 +53,10 @@ data = "b"
 <server>
 http
 </server>
- <name>
+<name>
 Two -K uses with --next and then one on cmdline
- </name>
- <command>
+</name>
+<command>
 -K %LOGDIR/config%TESTNUMBER-a -K %LOGDIR/config%TESTNUMBER-b --next -d c %HOSTIP:%HTTPPORT/%TESTNUMBER0003 -H "c: c"
 </command>
 </client>

diff --git a/tests/data/test432 b/tests/data/test432
index fd056c36808479277a0fb28c0670ff4744ae17db..02a46111d324dff5092dd5b0312f99b501e45d62 100644 (file)
--- a/tests/data/test432
+++ b/tests/data/test432
@@ -58,10 +58,10 @@ data = "c"
 <server>
 http
 </server>
- <name>
+<name>
 Use -K with --next and --config from within
- </name>
- <command>
+</name>
+<command>
 -K %LOGDIR/config%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test437 b/tests/data/test437
index a49fb8c48b0cd1591d64569b3e052fb668cdde73..f12052d241259d75a958fcb49e887ee7d8b41784 100644 (file)
--- a/tests/data/test437
+++ b/tests/data/test437
@@ -32,14 +32,14 @@ alt-svc
 <server>
 http
 </server>
- <name>
+<name>
 Alt-Svc to numerical IPv6 address
- </name>
+</name>
 <setenv>
 # make debug-curl accept Alt-Svc over plain HTTP
 CURL_ALTSVC_HTTP="yeah"
 </setenv>
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --alt-svc "%LOGDIR/altsvc-%TESTNUMBER"
 </command>
 </client>

diff --git a/tests/data/test438 b/tests/data/test438
index 9015e927e8f3f0ebc743de17088777c9203c5bb9..4dd3b82c80c92382e18b185f6305e93550edcacb 100644 (file)
--- a/tests/data/test438
+++ b/tests/data/test438
@@ -36,14 +36,14 @@ ipv6
 http
 http-ipv6
 </server>
- <name>
+<name>
 HTTPS IPv4 GET translated by alt-svc to IPv6 address
- </name>
+</name>
 <setenv>
 # make debug-curl accept Alt-Svc over plain HTTP
 CURL_ALTSVC_HTTP="yeah"
 </setenv>
- <command>
+<command>
 --alt-svc "%LOGDIR/altsvc-%TESTNUMBER" "http://%HOSTIP:%HTTPPORT/%TESTNUMBER" "http://%HOSTIP:%HTTPPORT/%TESTNUMBER"
 </command>
 <file name="%LOGDIR/altsvc-%TESTNUMBER">

diff --git a/tests/data/test44 b/tests/data/test44
index ed6ea230105e2db34188f3e2567cc297bd3bf230..bc103e031b342ff65bb6653ee9df60b2bb446120 100644 (file)
--- a/tests/data/test44
+++ b/tests/data/test44
@@ -26,10 +26,10 @@ Mime
 <server>
 http
 </server>
- <name>
+<name>
 HTTP RFC1867-type formposting without Expect: header
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F name=daniel -F tool=curl -F file=@%LOGDIR/test%TESTNUMBER.txt -H "Expect:"
 </command>
 # We create this file before the command is invoked!

diff --git a/tests/data/test445 b/tests/data/test445
index 0406c0f9acdb9c8c1ed0d743a761eaf073ea7f75..dbdcfe6ba4568f9d46e1c91f897936a372c5c64d 100644 (file)
--- a/tests/data/test445
+++ b/tests/data/test445
@@ -42,10 +42,10 @@ smtp
 <server>
 http-proxy
 </server>
- <name>
+<name>
 Refuse tunneling protocols through HTTP proxy
- </name>
- <command>
+</name>
+<command>
 -x http://%HOSTIP:%PROXYPORT/%TESTNUMBER -p gopher://127.0.0.1 dict://127.0.0.1 http://moo https://example telnet://another ftp://yes ftps://again imap://more ldap://perhaps mqtt://yes pop3://mail rtsp://harder scp://copy sftp://files smb://wird smtp://send
 </command>
 </client>

diff --git a/tests/data/test45 b/tests/data/test45
index 0368882d67834d65c9af1d11c7668f22cd7e28d8..e7c3b65926c96a940b260060a62944267868e3ea 100644 (file)
--- a/tests/data/test45
+++ b/tests/data/test45
@@ -49,10 +49,10 @@ If this is received, the location following worked
 <server>
 http
 </server>
- <name>
+<name>
 simple HTTP Location: without protocol in initial URL
- </name>
- <command>
+</name>
+<command>
 %HOSTIP:%HTTPPORT/want/%TESTNUMBER -L
 </command>
 </client>

diff --git a/tests/data/test46 b/tests/data/test46
index 9f9e881cbd8b8e3b5b0e2ade126a09408965e088..042af7e6e671e24ba40ec3eaa81c6169149e9622 100644 (file)
--- a/tests/data/test46
+++ b/tests/data/test46
@@ -37,16 +37,16 @@ This server reply is for testing cookies
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with bad domain name, get cookies and store in cookie jar
- </name>
+</name>
 # Explicitly set the time zone to a known good one, in case the user is
 # using one of the 'right' zones that take into account leap seconds
 # which causes the cookie expiry times to be different from what we expect.
 <setenv>
 TZ=GMT
 </setenv>
- <command>
+<command>
 domain..tld:%HTTPPORT/want/%TESTNUMBER --resolve domain..tld:%HTTPPORT:%HOSTIP -c %LOGDIR/jar%TESTNUMBER -b %LOGDIR/injar%TESTNUMBER
 </command>
 <file name="%LOGDIR/injar%TESTNUMBER">

diff --git a/tests/data/test47 b/tests/data/test47
index e506b346bf362d4ef9a3a6eac5cae10631098bd7..42086999b4deeba7fba948364ba9d86ad82b2cef 100644 (file)
--- a/tests/data/test47
+++ b/tests/data/test47
@@ -24,10 +24,10 @@ Server: test-server/fake
 <server>
 http
 </server>
- <name>
+<name>
 simple HTTP 1.0 GET
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -0
 </command>
 </client>

diff --git a/tests/data/test48 b/tests/data/test48
index c983768341443ec878f018d737bea9766f5e7985..24fa0abbb38b4ff99e4026362d594f11d8d97137 100644 (file)
--- a/tests/data/test48
+++ b/tests/data/test48
@@ -25,10 +25,10 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with -d and -G and -I
- </name>
- <command>
+</name>
+<command>
 -d "foo=moo&moo=poo" http://%HOSTIP:%HTTPPORT/%TESTNUMBER -G -I http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test49 b/tests/data/test49
index 79890d68b4eedfdad4bdcc477b17112f15df1067..996cf018bde1f0080faa96e49e110e1dd712b6ce 100644 (file)
--- a/tests/data/test49
+++ b/tests/data/test49
@@ -45,10 +45,10 @@ body
 <server>
 http
 </server>
- <name>
+<name>
 HTTP follow redirect with ../
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
 </command>
 </client>

diff --git a/tests/data/test490 b/tests/data/test490
index e94ea0d2a16d3276c86636d6c3564cb389d3e2f8..a0bc8f35396385d33647953518394c9f7704f584 100644 (file)
--- a/tests/data/test490
+++ b/tests/data/test490
@@ -31,10 +31,10 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 Two globbed HTTP PUTs
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T '{%LOGDIR/in%TESTNUMBER,%LOGDIR/in%TESTNUMBER}'
 </command>
 <file name="%LOGDIR/in%TESTNUMBER">

diff --git a/tests/data/test491 b/tests/data/test491
index a3c93aa50c947799d5a36c257864ae98c35b43d8..15bb756b55b69543e7095a11511a4067390bd7b1 100644 (file)
--- a/tests/data/test491
+++ b/tests/data/test491
@@ -31,10 +31,10 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 Two globbed HTTP PUTs, the second upload file is missing
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T '{%LOGDIR/in%TESTNUMBER,%LOGDIR/bad%TESTNUMBER}'
 </command>
 <file name="%LOGDIR/in%TESTNUMBER">

diff --git a/tests/data/test492 b/tests/data/test492
index dcf18eb694b3c37477214d1092862c075eeb7d3d..d576cca1cfdbf851115d26175c55ad23e94ba66c 100644 (file)
--- a/tests/data/test492
+++ b/tests/data/test492
@@ -31,10 +31,10 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 Two globbed HTTP PUTs to two globbed URLs
- </name>
- <command>
+</name>
+<command>
 'http://%HOSTIP:%HTTPPORT/{one,two}/' -T '{%LOGDIR/first%TESTNUMBER,%LOGDIR/second%TESTNUMBER}' -H "Testno: %TESTNUMBER"
 </command>
 <file name="%LOGDIR/first%TESTNUMBER">

diff --git a/tests/data/test494 b/tests/data/test494
index 78faab6a1d50d7ef356cbd543bd2106777f2a165..648318729d113c3f03a27a8a7d932595d5a3b2c5 100644 (file)
--- a/tests/data/test494
+++ b/tests/data/test494
@@ -21,10 +21,10 @@ blipp
 <server>
 ftp
 </server>
- <name>
+<name>
 skip 'macdef' when parsing netrc
- </name>
- <command>
+</name>
+<command>
 --netrc --netrc-file %LOGDIR/netrc%TESTNUMBER ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 <file name="%LOGDIR/netrc%TESTNUMBER" >

diff --git a/tests/data/test496 b/tests/data/test496
index 19050f3772807f13eaca717c973b3d900f51da69..aa729c66ad8c65c9cfe7722385eb8e78a0bb7898 100644 (file)
--- a/tests/data/test496
+++ b/tests/data/test496
@@ -21,7 +21,7 @@ none
 <name>
 parallel upload missing file
 </name>
- <command>
+<command>
 0 -Z -Tz
 </command>
 </client>

diff --git a/tests/data/test5 b/tests/data/test5
index 4e8cd46eefddc3285603f3468b920371fefce10d..8d4078fb77c7307f45548a0dfd6bfbf3e278c3de 100644 (file)
--- a/tests/data/test5
+++ b/tests/data/test5
@@ -25,10 +25,10 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 HTTP over proxy
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER#5 -x %HOSTIP:%HTTPPORT
 </command>
 <features>

diff --git a/tests/data/test50 b/tests/data/test50
index 308095e38cf3084e85a84672d569fc3fcb331adb..ce4fd16601941c6ef0aea922a8874d05c29a7537 100644 (file)
--- a/tests/data/test50
+++ b/tests/data/test50
@@ -45,10 +45,10 @@ body
 <server>
 http
 </server>
- <name>
+<name>
 HTTP follow redirect with ../../
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
 </command>
 </client>

diff --git a/tests/data/test500 b/tests/data/test500
index 384de1b5debc86dabbd028b6921752f7d9977815..c215318bc51983fd2f957b0d8c9531f97e317b61 100644 (file)
--- a/tests/data/test500
+++ b/tests/data/test500
@@ -34,10 +34,10 @@ http
 lib500
 </tool>
 
- <name>
+<name>
 simple libcurl HTTP GET tool
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test501 b/tests/data/test501
index b86642f6a3269f3687585b60b03d5d91f9cf680f..fb115cba645f2818e7313342f28d4cddef43288b 100644 (file)
--- a/tests/data/test501
+++ b/tests/data/test501
@@ -22,10 +22,10 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 simple libcurl attempt operation without URL set
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test502 b/tests/data/test502
index 4a6d60f132d80bbb09201494445d728a77959009..0bca19c623bc70dc8aec789e128929fbb8888776 100644 (file)
--- a/tests/data/test502
+++ b/tests/data/test502
@@ -26,10 +26,10 @@ file
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 simple multi file:// get
- </name>
- <command>
+</name>
+<command>
 file://%PWD/%LOGDIR/test%TESTNUMBER.txt
 </command>
 <file name="%LOGDIR/test%TESTNUMBER.txt">

diff --git a/tests/data/test503 b/tests/data/test503
index d8e04aa65036e405af847f77a4b88f5f62b612ab..0690ad34079b5f5830cf79d3ca5b4a6f1cdab483 100644 (file)
--- a/tests/data/test503
+++ b/tests/data/test503
@@ -53,10 +53,10 @@ lib%TESTNUMBER
 <features>
 proxy
 </features>
- <name>
+<name>
 simple multi http:// through proxytunnel with authentication info
- </name>
- <command>
+</name>
+<command>
 http://machine.%TESTNUMBER:%HTTPPORT/%TESTNUMBER %HOSTIP:%PROXYPORT
 </command>
 <file name="%LOGDIR/test%TESTNUMBER.txt">

diff --git a/tests/data/test504 b/tests/data/test504
index 05061e2a897fca7ba51aff79fdf304af029754de..917c4aee167c81a8310ad01da5c036f808d560d0 100644 (file)
--- a/tests/data/test504
+++ b/tests/data/test504
@@ -28,10 +28,10 @@ proxy
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 simple multi through local proxy without listener
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER %HOSTIP:%NOLISTENPORT
 </command>
 </client>

diff --git a/tests/data/test505 b/tests/data/test505
index 03437063f97ae9bee6fde1ed2270e7362578eb42..6eba48936fe9dd33233ba42a493915b808b80af5 100644 (file)
--- a/tests/data/test505
+++ b/tests/data/test505
@@ -19,10 +19,10 @@ ftp
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 FTP upload with rename after transfer
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER %LOGDIR/upload%TESTNUMBER
 </command>
 <file name="%LOGDIR/upload%TESTNUMBER">

diff --git a/tests/data/test508 b/tests/data/test508
index 143fe317163a03977a850932be0f2f843319cc13..06cdba75f5d6b8a833f7095ff9a5883800bf0189 100644 (file)
--- a/tests/data/test508
+++ b/tests/data/test508
@@ -30,10 +30,10 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 send HTTP POST using read callback
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test51 b/tests/data/test51
index 9bb28654c0d7214dd9485d539dafacbc80d0e8a9..277da000fbaf4814b0cc297c1e47abec2c25537e 100644 (file)
--- a/tests/data/test51
+++ b/tests/data/test51
@@ -45,10 +45,10 @@ body
 <server>
 http
 </server>
- <name>
+<name>
 HTTP follow redirect with excessive ../
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
 </command>
 </client>

diff --git a/tests/data/test510 b/tests/data/test510
index b673fa11b76e7d0200328cd114d5f24286b07afe..36d6c1f1373fe1e1a10957c9a7bea5cde9b3a48b 100644 (file)
--- a/tests/data/test510
+++ b/tests/data/test510
@@ -31,10 +31,10 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 send HTTP POST using read callback, using chunked transfer-encoding
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test511 b/tests/data/test511
index 6bcf25de59ba04388fb8507126d591b4bd1c8dd8..adcabe8bda6c6e0a725138761d7b3ad96df67dcb 100644 (file)
--- a/tests/data/test511
+++ b/tests/data/test511
@@ -24,10 +24,10 @@ ftp
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 FTP with FILETIME and NOBODY but missing file
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test512 b/tests/data/test512
index 6598d3162de994407d695fb65c03f09d0ba5589b..8935a12c77ec588955d3b90c8ade56878f299f80 100644 (file)
--- a/tests/data/test512
+++ b/tests/data/test512
@@ -29,10 +29,10 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 simple curl_easy_duplicate() test
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test513 b/tests/data/test513
index df0a96260a07dfae32081ec5c606a0b4e34c70df..ae413bbc939d2951ff94cc3f363c8731eb88f9d7 100644 (file)
--- a/tests/data/test513
+++ b/tests/data/test513
@@ -21,9 +21,9 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 send HTTP POST using read callback that returns CURL_READFUNC_ABORT
- </name>
+</name>
 # the 1s post-command delay helps to prevent a spurious failure on s390
  <command delay="1">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER

diff --git a/tests/data/test514 b/tests/data/test514
index 1d5f38050080ecc3f23d44b87c798c53850368c6..fcf1a07ca35a36c112ac17ea541e8fe38a088a22 100644 (file)
--- a/tests/data/test514
+++ b/tests/data/test514
@@ -32,9 +32,9 @@ http
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 First set options to POST and then to make HEAD
- </name>
+</name>
 # the 1s post-command delay helps to prevent a spurious failure on s390
  <command delay="1">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER

diff --git a/tests/data/test515 b/tests/data/test515
index 42d153b03f643e5a4c01e5df4280558fdb681aba..9bf6131edd4e5f03b807841cbf3ff9da5770d0ef 100644 (file)
--- a/tests/data/test515
+++ b/tests/data/test515
@@ -28,10 +28,10 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 make a POSTFIELDS set to NULL with POSTFIELDSIZE set to zero
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test516 b/tests/data/test516
index 0878cceb93bbf7ba9669e4e4746fa01c6480e6f2..e8b522c32dc939159b8a1b92ff5a370647a8bc2b 100644 (file)
--- a/tests/data/test516
+++ b/tests/data/test516
@@ -33,10 +33,10 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 make an HTTPPOST set to NULL
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test517 b/tests/data/test517
index 0152c0f29d0045e4d4ca33cb8f4d84b09aa1fd73..bd197cb5bc1b140e51756f6599100b44da8b2789 100644 (file)
--- a/tests/data/test517
+++ b/tests/data/test517
@@ -20,10 +20,10 @@ none
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 curl_getdate() testing
- </name>
- <command>
+</name>
+<command>
 nothing
 </command>
 </client>

diff --git a/tests/data/test518 b/tests/data/test518
index 042b6d767d56c6f81c3d60ec632b8809374579b2..05a809bf32c6f9848af57bfee61bad52aec71814 100644 (file)
--- a/tests/data/test518
+++ b/tests/data/test518
@@ -43,10 +43,10 @@ lib%TESTNUMBER
 ./libtest/lib%TESTNUMBER check
 </precheck>
 
- <name>
+<name>
 HTTP GET with more than FD_SETSIZE descriptors open
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test519 b/tests/data/test519
index 9b47ed28c5756b4fa3cd190c118a19d76672f1b8..08e56a2ea68f6af46f8a647f71112cb9741c6701 100644 (file)
--- a/tests/data/test519
+++ b/tests/data/test519
@@ -51,10 +51,10 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 GET same URL twice with different users
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test52 b/tests/data/test52
index 662a4ef331488ee1f85ef4c0565e264d56d695dd..e636ed959c9b6f8c59d179356faa57ff73ac481d 100644 (file)
--- a/tests/data/test52
+++ b/tests/data/test52
@@ -45,10 +45,10 @@ body
 <server>
 http
 </server>
- <name>
+<name>
 HTTP follow redirect with ./-prefix
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
 </command>
 </client>

diff --git a/tests/data/test520 b/tests/data/test520
index 755caebebc06f62223bc171c2a5f6e0e7cfc12d4..6a27bb3f8e4984c44c63d7df3041be685ace0774 100644 (file)
--- a/tests/data/test520
+++ b/tests/data/test520
@@ -26,10 +26,10 @@ ftp
 lib520
 </tool>
 
- <name>
+<name>
 FTP RETR with FILETIME
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/520
 </command>
 </client>

diff --git a/tests/data/test521 b/tests/data/test521
index b8b7896a5468af22c019ab57a059c0e08d1e81e5..1eec1bb2cf9d2d65e38ca7bdc0eefa92fb167b97 100644 (file)
--- a/tests/data/test521
+++ b/tests/data/test521
@@ -35,10 +35,10 @@ ftp
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 FTP dir list PASV with CURLOPT_PORT
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP/%TESTNUMBER/ %FTPPORT
 </command>
 </client>

diff --git a/tests/data/test522 b/tests/data/test522
index 6691a29a1578cea585e2fac46d4b25dd03de2bac..3aa053a58434f0052588f2857fdf0e0855bbc77f 100644 (file)
--- a/tests/data/test522
+++ b/tests/data/test522
@@ -32,10 +32,10 @@ http
 <tool>
 lib521
 </tool>
- <name>
+<name>
 HTTP GET with CURLOPT_PORT
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP/%TESTNUMBER %HTTPPORT
 </command>
 </client>

diff --git a/tests/data/test523 b/tests/data/test523
index 88cda7a2cd5eb773eebc7e345b9a04fef1e6b098..2bd5a981987d019723ce22447f26ef3f8d937310 100644 (file)
--- a/tests/data/test523
+++ b/tests/data/test523
@@ -34,11 +34,11 @@ http
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 HTTP GET with proxy and CURLOPT_PORT
- </name>
+</name>
 # first URL then proxy
- <command>
+<command>
 http://www.example.com:999/%TESTNUMBER http://%HOSTIP:%HTTPPORT
 </command>
 <features>

diff --git a/tests/data/test524 b/tests/data/test524
index 13246e235dea230d83f599de8fcbb5c1f57f43e2..3b383003fb53bb255d5fe158fcadcd0884bcbc49 100644 (file)
--- a/tests/data/test524
+++ b/tests/data/test524
@@ -20,11 +20,11 @@ ftp
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 FTP upload with target URL ending with slash
- </name>
+</name>
 # first URL then proxy
- <command>
+<command>
 ftp://%HOSTIP:%FTPPORT/path/to/
 </command>
 </client>

diff --git a/tests/data/test525 b/tests/data/test525
index 43e5728e97137553ed0d1060bf3109c88365ea21..2b96a7fd96731c3d63de186fde0b79fc1eb42ecc 100644 (file)
--- a/tests/data/test525
+++ b/tests/data/test525
@@ -22,10 +22,10 @@ ftp
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 FTP PORT upload using multi interface
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %LOGDIR/upload%TESTNUMBER
 </command>
 <file name="%LOGDIR/upload%TESTNUMBER">

diff --git a/tests/data/test526 b/tests/data/test526
index be2e4be802895501dbafd50d64ebb811aa77798b..85b24d5db924330aa6dee157752e5a62d0722954 100644 (file)
--- a/tests/data/test526
+++ b/tests/data/test526
@@ -29,10 +29,10 @@ ftp
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 FTP RETR same file using different handles but same connection
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test527 b/tests/data/test527
index be2e4be802895501dbafd50d64ebb811aa77798b..85b24d5db924330aa6dee157752e5a62d0722954 100644 (file)
--- a/tests/data/test527
+++ b/tests/data/test527
@@ -29,10 +29,10 @@ ftp
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 FTP RETR same file using different handles but same connection
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test528 b/tests/data/test528
index a55768b3365a222a37c8d642b4dfc688c63621ae..7cb9e8b1149f27417636b7ffbf0f04adbc9470a2 100644 (file)
--- a/tests/data/test528
+++ b/tests/data/test528
@@ -33,10 +33,10 @@ http
 <tool>
 lib526
 </tool>
- <name>
+<name>
 HTTP GET same file using different handles but same connection
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/path/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test529 b/tests/data/test529
index 9c2bc501b55019902e792bb43088aec64834ed25..737e5018f9116e9c521fc4b5bdc05b0eb0fbcdd0 100644 (file)
--- a/tests/data/test529
+++ b/tests/data/test529
@@ -22,10 +22,10 @@ ftp
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 FTP PORT upload using multi interface (weird cleanup function sequence)
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %LOGDIR/upload%TESTNUMBER
 </command>
 <file name="%LOGDIR/upload%TESTNUMBER">

diff --git a/tests/data/test53 b/tests/data/test53
index 86dfe9af4f8b11f3dca16dab21d77aacadaf2bf9..0bbc5d63734e8e6f6e5c252d97df788d1cfecec1 100644 (file)
--- a/tests/data/test53
+++ b/tests/data/test53
@@ -25,10 +25,10 @@ This server says moo
 <server>
 http
 </server>
- <name>
+<name>
 HTTP, junk session cookies
- </name>
- <command>
+</name>
+<command>
 %HOSTIP:%HTTPPORT/want/%TESTNUMBER -b %LOGDIR/injar%TESTNUMBER -j
 </command>
 <file name="%LOGDIR/injar%TESTNUMBER">

diff --git a/tests/data/test531 b/tests/data/test531
index 3463613ac86af96695646ed2fac85aa6593032de..59501d5ead4e716bd80b1e34810a316f6139ab37 100644 (file)
--- a/tests/data/test531
+++ b/tests/data/test531
@@ -25,10 +25,10 @@ ftp
 <tool>
 lib525
 </tool>
- <name>
+<name>
 FTP PORT upload using multi interface and get 425 response
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %LOGDIR/upload%TESTNUMBER
 </command>
 <file name="%LOGDIR/upload%TESTNUMBER">

diff --git a/tests/data/test532 b/tests/data/test532
index f36d0440cb8b5177688b25448de97f8a117691e2..c1d3b0b0c8bed8ebb05098c66ee84f68983ff180 100644 (file)
--- a/tests/data/test532
+++ b/tests/data/test532
@@ -29,10 +29,10 @@ ftp
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 FTP RETR same file using reset handles between each transfer
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test533 b/tests/data/test533
index 4e94f88eb69b9825b26ea6d337f3eebf55b9a756..1dbceb6dd3b535f6f46b5f9f25fc48a3172b62dc 100644 (file)
--- a/tests/data/test533
+++ b/tests/data/test533
@@ -27,10 +27,10 @@ ftp
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 FTP RETR a non-existing file twice using the multi interface
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test534 b/tests/data/test534
index 764fe6647d3810af20aa5e36e10e777c049d07cf..0e0f35abdd15e05a9388eec61396c0855267ad75 100644 (file)
--- a/tests/data/test534
+++ b/tests/data/test534
@@ -28,10 +28,10 @@ ftp
 <tool>
 lib533
 </tool>
- <name>
+<name>
 FTP RETR twice using multi: non-existing host and non-existing file
- </name>
- <command>
+</name>
+<command>
 ftp://non-existing-host.haxx.se/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test535 b/tests/data/test535
index f9e6c390a652041718581d9432082c0970043fa1..aa52197767e1d3e89fbe43efb79238451ccf10ec 100644 (file)
--- a/tests/data/test535
+++ b/tests/data/test535
@@ -44,10 +44,10 @@ http
 lib533
 </tool>
 
- <name>
+<name>
 HTTP GET multi two files with FAILONERROR
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001
 </command>
 </client>

diff --git a/tests/data/test537 b/tests/data/test537
index ab718fd291a29e3099feafef24d2d6c30c281f2c..79678c38e916ec6a62539b259f1ea1bb5ac830fa 100644 (file)
--- a/tests/data/test537
+++ b/tests/data/test537
@@ -43,10 +43,10 @@ lib%TESTNUMBER
 ./libtest/lib%TESTNUMBER check
 </precheck>
 
- <name>
+<name>
 HTTP GET with a HUGE number of file descriptors open
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test538 b/tests/data/test538
index ff53a8ed6d7adbbcc79c08d8733a900e76c1260d..a269cdf1a2122c61060a2cad68f5840b5eb65e2b 100644 (file)
--- a/tests/data/test538
+++ b/tests/data/test538
@@ -23,10 +23,10 @@ ftp
 <tool>
 lib504
 </tool>
- <name>
+<name>
 FTP multi-interface download, failed login: PASS not valid
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test539 b/tests/data/test539
index 12f04e921e411cda895565335944fc6c0dc72e3b..1fb4e125544c12856d10617218d8342177b0e2dd 100644 (file)
--- a/tests/data/test539
+++ b/tests/data/test539
@@ -40,10 +40,10 @@ ftp
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 Two FTP fetches using different CURLOPT_FTP_FILEMETHOD
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/path/to/the/file/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test54 b/tests/data/test54
index a9efc2929dbb4021de145c9209aeac1a5abdcdbe..8a463118ccd6c242f370dd0227296975eb2906fb 100644 (file)
--- a/tests/data/test54
+++ b/tests/data/test54
@@ -22,10 +22,10 @@ This server reply is for testing
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with blank Location:
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L
 </command>
 </client>

diff --git a/tests/data/test540 b/tests/data/test540
index 3e240488efa1ed3ad0d2cf4779a4c58979e86126..ef13108b19326772b7a7d05f0a58a9e7f6523e5a 100644 (file)
--- a/tests/data/test540
+++ b/tests/data/test540
@@ -69,10 +69,10 @@ lib%TESTNUMBER
 crypto
 proxy
 </features>
- <name>
+<name>
 HTTP proxy auth Digest multi API re-using connection
- </name>
- <command>
+</name>
+<command>
 http://test.remote.example.com/path/%TESTNUMBER http://%HOSTIP:%HTTPPORT silly:person custom.set.host.name
 </command>
 </client>

diff --git a/tests/data/test541 b/tests/data/test541
index fbcfeb4d5edcc3f3d505ca7184790c32e12bacf4..c0677d8ea99f5fabf44febaa77e6ca6df355b2ed 100644 (file)
--- a/tests/data/test541
+++ b/tests/data/test541
@@ -19,10 +19,10 @@ ftp
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 FTP upload and upload same file again without rewind
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER %LOGDIR/upload%TESTNUMBER
 </command>
 <file name="%LOGDIR/upload%TESTNUMBER">

diff --git a/tests/data/test542 b/tests/data/test542
index 0d918fbcd0cf8ccf70fc457292de8a423a6abbb1..b39b1b30d1a57bd5894e6e4cf6a2c32a855f3c20 100644 (file)
--- a/tests/data/test542
+++ b/tests/data/test542
@@ -30,10 +30,10 @@ ftp
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 FTP a file with NOBODY yes and HEADER no
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 

diff --git a/tests/data/test543 b/tests/data/test543
index 2abaa696217a14c3f01532849bb980dacfa8623a..e3ac13bd2f1bbbc1bf5687da2df30d3f1a67f8f8 100644 (file)
--- a/tests/data/test543
+++ b/tests/data/test543
@@ -14,10 +14,10 @@ none
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 curl_easy_escape
- </name>
- <command>
+</name>
+<command>
 -
 </command>
 

diff --git a/tests/data/test544 b/tests/data/test544
index 390489706d28d7127398dae79cf48308c115ed6b..a35c9cf707216f24e91f48ef7eebb74d6716f58a 100644 (file)
--- a/tests/data/test544
+++ b/tests/data/test544
@@ -29,10 +29,10 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 HTTP POST text data using CURLOPT_COPYPOSTFIELDS
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test545 b/tests/data/test545
index a06b8ebb6e3844e77e58e78d213f8e9c1b93e409..3827cb9de419b087cfb1af9dc202d44bcf5da41f 100644 (file)
Binary files a/tests/data/test545 and b/tests/data/test545 differ

diff --git a/tests/data/test546 b/tests/data/test546
index 6db456f1684e27059ad36f731b723d4ef106318a..f8f01641a0aa61cbb947573dcb22735855c2bcf6 100644 (file)
--- a/tests/data/test546
+++ b/tests/data/test546
@@ -34,10 +34,10 @@ ftp
 <tool>
 lib533
 </tool>
- <name>
+<name>
 FTP RETR a non-existing file then a found one using the multi interface
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test549 b/tests/data/test549
index c7573a0329aeba6ff7ba7251741f42c663627702..95b2def5cf9e656a1fcd97eac70ad6ec5fde0d1f 100644 (file)
--- a/tests/data/test549
+++ b/tests/data/test549
@@ -37,11 +37,11 @@ proxy
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 FTP RETR over proxy with CURLOPT_PROXY_TRANSFER_MODE
- </name>
+</name>
 # first URL then proxy
- <command>
+<command>
 ftp://www.example.com/moo/%TESTNUMBER http://%HOSTIP:%HTTPPORT
 </command>
 </client>

diff --git a/tests/data/test55 b/tests/data/test55
index 8786d40b21cff89113fbd9887dbe768f024cdfe0..ea014f4aaea4fa5c38a1a0ae475ef0dfb7c21dcb 100644 (file)
--- a/tests/data/test55
+++ b/tests/data/test55
@@ -39,10 +39,10 @@ body
 <server>
 http
 </server>
- <name>
+<name>
 HTTP follow redirect with single slash in path
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -L
 </command>
 </client>

diff --git a/tests/data/test550 b/tests/data/test550
index 233546b6a1245f742315e66c8cf9993afe414cf6..a4ee2b49b22f81ee3d2fa4348aa965065dddfc1d 100644 (file)
--- a/tests/data/test550
+++ b/tests/data/test550
@@ -37,11 +37,11 @@ proxy
 <tool>
 lib549
 </tool>
- <name>
+<name>
 FTP RETR over proxy with CURLOPT_PROXY_TRANSFER_MODE and ASCII transfer
- </name>
+</name>
 # first URL then proxy
- <command>
+<command>
 ftp://www.example.com/moo/%TESTNUMBER http://%HOSTIP:%HTTPPORT ascii
 </command>
 </client>

diff --git a/tests/data/test551 b/tests/data/test551
index 2a6b1f5d522c55426b01ba759af291b0dac427cb..452da3927f6336bed85a6dd8d200d0b830c7ba80 100644 (file)
--- a/tests/data/test551
+++ b/tests/data/test551
@@ -65,10 +65,10 @@ lib547
 crypto
 proxy
 </features>
- <name>
+<name>
 HTTP proxy auth Digest with POST data from read callback
- </name>
- <command>
+</name>
+<command>
 http://test.remote.example.com/path/%TESTNUMBER http://%HOSTIP:%HTTPPORT s1lly:pers0n
 </command>
 </client>

diff --git a/tests/data/test552 b/tests/data/test552
index 99202fc2246ed2d0909043dc64151a9329b9548d..2658e73e66044a645079f2942228b138de089d5a 100644 (file)
--- a/tests/data/test552
+++ b/tests/data/test552
@@ -58,10 +58,10 @@ lib%TESTNUMBER
 crypto
 proxy
 </features>
- <name>
+<name>
 HTTP proxy auth Digest with 70K POST data from read callback
- </name>
- <command>
+</name>
+<command>
 http://test.remote.example.com/path/%TESTNUMBER http://s1lly:pers0n@%HOSTIP:%HTTPPORT/
 </command>
 </client>

diff --git a/tests/data/test553 b/tests/data/test553
index f640ba4d009917f5677d64d0037cb116d146ada1..4500751a1232560ea0be348a475a9fc6895cb03c 100644 (file)
--- a/tests/data/test553
+++ b/tests/data/test553
@@ -31,10 +31,10 @@ lib%TESTNUMBER
 </tool>
 <features>
 </features>
- <name>
+<name>
 HTTP post with huge request headers and post data from callback
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/path/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test554 b/tests/data/test554
index e0674bdb37f9616d76bc7b6ac1a5881d7246dced..1e2fc5f6b58a2f60c887ca13b6ab760ff447e5d4 100644 (file)
--- a/tests/data/test554
+++ b/tests/data/test554
@@ -50,10 +50,10 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 HTTP multi-part formpost using read callback for the file part
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test556 b/tests/data/test556
index 6384084d494a6f1698c3e2a8380d126e4c4e3b37..e531f012ea4b7e4d62d23253a619f78b428ec5e9 100644 (file)
--- a/tests/data/test556
+++ b/tests/data/test556
@@ -27,10 +27,10 @@ http
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 send and recv HTTP
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT
 </command>
 </client>

diff --git a/tests/data/test56 b/tests/data/test56
index b0701194dcb80c7f778dea914461b63e3cdd4127..8e4a12a9028dd67288037ab765e4a85b2c9bdbfe 100644 (file)
--- a/tests/data/test56
+++ b/tests/data/test56
@@ -23,9 +23,9 @@ This is the proof it works
 <server>
 http
 </server>
- <name>
+<name>
 HTTP POST with *HUGE* request and chunked transfer-encoding
- </name>
+</name>
  <stdin>
 #
 data "we post this"
@@ -37,7 +37,7 @@ header "Transfer-Encoding: chunked"
 -A "%repeat[99999 x a]%"
 #
  </stdin>
- <command>
+<command>
 -K - %HOSTIP:%HTTPPORT/that.site.com/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test560 b/tests/data/test560
index 0f9befb543a9ea7e706bd6507a099b7b13578fe0..30641a16685803ba68cd50da640d244627c18521 100644 (file)
--- a/tests/data/test560
+++ b/tests/data/test560
@@ -32,10 +32,10 @@ https
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 simple HTTPS GET with multi interface
- </name>
- <command>
+</name>
+<command>
 https://%HOSTIP:%HTTPSPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test561 b/tests/data/test561
index a630185b45f932930c23051801ca8987746fb124..09e381745c422248ac2c1dbb6bfb25cf9c5611ee 100644 (file)
--- a/tests/data/test561
+++ b/tests/data/test561
@@ -38,11 +38,11 @@ proxy
 <tool>
 lib549
 </tool>
- <name>
+<name>
 FTP RETR with CURLOPT_PROXY_TRANSFER_MODE, ASCII transfer and type=i
- </name>
+</name>
 # first URL then proxy
- <command>
+<command>
 "ftp://www.example.com/moo/%TESTNUMBER;type=i" http://%HOSTIP:%HTTPPORT ascii
 </command>
 </client>

diff --git a/tests/data/test562 b/tests/data/test562
index f442a63e576c80ebf484f5a4246e7e98b11166b3..d1793891d077cab23cb6c9af9528ade973f9a63f 100644 (file)
--- a/tests/data/test562
+++ b/tests/data/test562
@@ -22,13 +22,13 @@ ftp
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 FTP a type=A URL and CURLOPT_PORT set
- </name>
+</name>
 
 # note that we need quotes around the URL below to make sure the shell doesn't
 # treat the semicolon as a separator!
- <command>
+<command>
 'ftp://%HOSTIP:23456/%TESTNUMBER;type=A' %FTPPORT
 </command>
 

diff --git a/tests/data/test563 b/tests/data/test563
index c19b9026a2283d38892ecd9f0a91383fd8aecce2..b7c61db768b9325fefe0140d8e79fcafea366483 100644 (file)
--- a/tests/data/test563
+++ b/tests/data/test563
@@ -29,9 +29,9 @@ ftp
 <tool>
 lib562
 </tool>
- <name>
+<name>
 FTP type=A URL and CURLOPT_PORT set and proxy
- </name>
+</name>
 <features>
 proxy
 </features>
@@ -40,7 +40,7 @@ ftp_proxy=http://%HOSTIP:%HTTPPORT/
 </setenv>
 # note that we need quotes around the URL below to make sure the shell doesn't
 # treat the semicolon as a separator!
- <command>
+<command>
 "ftp://%HOSTIP:23456/%TESTNUMBER;type=A" %FTPPORT
 </command>
 

diff --git a/tests/data/test564 b/tests/data/test564
index 3d866f2839d3ebc92687ee1c3667a45aed50bef2..96a6f9b1a6b7bcae19244277f376a1e0da949a9e 100644 (file)
--- a/tests/data/test564
+++ b/tests/data/test564
@@ -32,9 +32,9 @@ socks4
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 FTP RETR a file over a SOCKS proxy using the multi interface
- </name>
+</name>
 <command>
 ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %HOSTIP:%SOCKSPORT
 </command>

diff --git a/tests/data/test565 b/tests/data/test565
index 92a7a702b2f13b7d0600cd3cfdf90160d35b672c..2587c68d6bc549cbc3fd390f92ad5860aad0c27b 100644 (file)
--- a/tests/data/test565
+++ b/tests/data/test565
@@ -66,10 +66,10 @@ crypto
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 send HTTP POST using read callback, chunked transfer-encoding and Digest
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test566 b/tests/data/test566
index 1fc3968ebb68568881391bdad5a9209d8f79f024..1ff92f4e21b87a9583a9cf40875773481244b687 100644 (file)
--- a/tests/data/test566
+++ b/tests/data/test566
@@ -33,10 +33,10 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 HTTP GET with CURLINFO_CONTENT_LENGTH_DOWNLOAD and 0 bytes transfer
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test57 b/tests/data/test57
index 70b219d91735faf8fbad5c5a529b33bfe37f57e1..f177f08eb46c3f3935632547e9e83ad12e8bd49b 100644 (file)
--- a/tests/data/test57
+++ b/tests/data/test57
@@ -22,10 +22,10 @@ Content-Type: text/html; charset=ISO-8859-4
 <server>
 http
 </server>
- <name>
+<name>
 HTTP content-type with spaces in
- </name>
- <command>
+</name>
+<command>
 -w "%{content_type}\n" http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/out%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test573 b/tests/data/test573
index cab270bb65f300953650233d9ce9642bbc5e26e7..67e806dcdf6691eb12406a8b63fb027b45341c4f 100644 (file)
--- a/tests/data/test573
+++ b/tests/data/test573
@@ -35,10 +35,10 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 verify connect time with multi interface
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test575 b/tests/data/test575
index e84a39f05d37b9fa90f81ba87ebc67ee5698e666..d51c5a08d5cf07efd6ed69c6afcc4a274a80fca6 100644 (file)
--- a/tests/data/test575
+++ b/tests/data/test575
@@ -23,10 +23,10 @@ ftp
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 FTP wildcard download - dup_handle and multi interface
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/fully_simulated/UNIX/*
 </command>
 </client>

diff --git a/tests/data/test576 b/tests/data/test576
index 2a1b9419cff53542b093bb4650fce73eca728010..e8f190156aa069f26789359b8dee235a09914377 100644 (file)
--- a/tests/data/test576
+++ b/tests/data/test576
@@ -21,10 +21,10 @@ ftp
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 FTP wildcard download - skip/parser_correctness/CURLOPT_FNMATCH_FUNCTION (Unix)
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/fully_simulated/UNIX/*
 </command>
 </client>

diff --git a/tests/data/test578 b/tests/data/test578
index 9bce5818e51d2e25427efc9c6517b7aa91938ae6..d909de87baa79e0fd3f43adf365ad3656187ddc5 100644 (file)
--- a/tests/data/test578
+++ b/tests/data/test578
@@ -34,10 +34,10 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 HTTP POST lower than MAX_INITIAL_POST_SIZE with progress callback
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test579 b/tests/data/test579
index 3a532d811bc9f0d8711db05a50f77eedb94a94d2..476499ff0758615ea55a9cee681fe0e22ecf338b 100644 (file)
--- a/tests/data/test579
+++ b/tests/data/test579
@@ -64,10 +64,10 @@ crypto
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 small chunked HTTP POSTs with digest auth. and progress callback
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test58 b/tests/data/test58
index e68cca92628bc11388761b5de62193176703e94e..fd4beac00f4751dd3d07e3d640098cd61485c537 100644 (file)
--- a/tests/data/test58
+++ b/tests/data/test58
@@ -25,7 +25,7 @@ http
 <name>
 HTTP PUT from file with weird letters
 </name>
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/ -T %LOGDIR/%TESTNUMBERte[]st.txt -g
 </command>
 <file name="%LOGDIR/%TESTNUMBERte[]st.txt">

diff --git a/tests/data/test580 b/tests/data/test580
index c19a52a30fd31c6fd9bb1c9f38c22942346674e4..63cd0ca0deb9ff0fbe9d4f37fba365bfc77ec7c1 100644 (file)
--- a/tests/data/test580
+++ b/tests/data/test580
@@ -35,10 +35,10 @@ http
 lib507
 </tool>
 
- <name>
+<name>
 multi interface, multiple Location: headers
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test581 b/tests/data/test581
index 50b99e3911fd7d638d2e8f74e3d21e7f7ed5e7d5..e784e72ea548e4eead062595e47bd1657ac2a124 100644 (file)
--- a/tests/data/test581
+++ b/tests/data/test581
@@ -35,10 +35,10 @@ http
 lib507
 </tool>
 
- <name>
+<name>
 multi interface, multiple Content-Type: headers
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test582 b/tests/data/test582
index f626d0bab8f55a3622b0997c98208a1ffab0486e..194591b53ed24f5671363dbef3e9531a2a75f4b5 100644 (file)
--- a/tests/data/test582
+++ b/tests/data/test582
@@ -20,10 +20,10 @@ sftp
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 SFTP upload using multi interface
- </name>
- <command>
+</name>
+<command>
 Sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/upload%TESTNUMBER.txt %PWD/%LOGDIR/file%TESTNUMBER.txt %USER: %LOGDIR/server/curl_client_key.pub %LOGDIR/server/curl_client_key
 </command>
 <file name="%LOGDIR/file%TESTNUMBER.txt">

diff --git a/tests/data/test583 b/tests/data/test583
index 51e435c005eb7de2891cd36ba43e84d3e1ea1bf6..0f49cd9955f30cab3ee8b321210e45cb5309ada4 100644 (file)
--- a/tests/data/test583
+++ b/tests/data/test583
@@ -20,15 +20,15 @@ sftp
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 SFTP with multi interface, remove handle early
- </name>
+</name>
 
 # The command here uses 'localhost' just to make sure that curl_multi_perform
 # won't reach too far in the first invoke. When using c-ares at least, the
 # name resolve will cause it to return rather quickly and thus we could trigger
 # the problem we're looking to verify.
- <command>
+<command>
 sftp://localhost:%SSHPORT%SSH_PWD/%LOGDIR/upload%TESTNUMBER.txt %USER: %LOGDIR/server/curl_client_key.pub %LOGDIR/server/curl_client_key
 </command>
 </client>

diff --git a/tests/data/test584 b/tests/data/test584
index 0f8fe8159787c4fac08452c48d8a37cd2eb0e837..a263e71879e6fb4699b6e21d0713b89108ec6442 100644 (file)
--- a/tests/data/test584
+++ b/tests/data/test584
@@ -47,10 +47,10 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 CURLOPT_MIMEPOST first set then set to NULL
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test585 b/tests/data/test585
index 213edef2c6c6bf08503a6f1c9bc180196f1b7aed..393498c61387c2b5ffb4f3cc63c66dee9904aef1 100644 (file)
--- a/tests/data/test585
+++ b/tests/data/test585
@@ -46,10 +46,10 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 socket open/close callbacks
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test586 b/tests/data/test586
index 18d614b5d18f4c2518909253d30ec650d82e0fbf..b17a702a6bd474ed19d01c4b6447a4376fc8b267 100644 (file)
--- a/tests/data/test586
+++ b/tests/data/test586
@@ -34,10 +34,10 @@ ftp
 <tool>
 lib585
 </tool>
- <name>
+<name>
 FTP and open/close socket callbacks
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test587 b/tests/data/test587
index 62e54b3b5aacfaaa6dd3d593471c846e3540c7dc..541df4546a558c116ee46feedce7f1110663bb56 100644 (file)
--- a/tests/data/test587
+++ b/tests/data/test587
@@ -28,9 +28,9 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 HTTP multi-part formpost with aborted read callback
- </name>
+</name>
 # Add a delay to give server time to write its output since we otherwise might
 # not even give it enough time to write its lock file.
  <command delay="1">

diff --git a/tests/data/test588 b/tests/data/test588
index d36bafee5255b95e8428b5cff062deb9f7c98bf0..9c8c5f32024276a661e8c4cb92385ee296a597bf 100644 (file)
--- a/tests/data/test588
+++ b/tests/data/test588
@@ -31,10 +31,10 @@ ftp
 <tool>
 lib525
 </tool>
- <name>
+<name>
 FTP PORT upload using multi interface, EPRT doesn't work
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %LOGDIR/upload%TESTNUMBER
 </command>
 <file name="%LOGDIR/upload%TESTNUMBER">

diff --git a/tests/data/test589 b/tests/data/test589
index beafaa7cd37175313567a1d17c088d11b0aac23f..c798c0eed926fda91006a106bc5eda23389a4eb6 100644 (file)
--- a/tests/data/test589
+++ b/tests/data/test589
@@ -33,10 +33,10 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 make an HTTP MIME POST set to NULL
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test59 b/tests/data/test59
index 809e4723d96b54d6e598f6a9e6313f40a0aeb0c3..b86b02d3d03596b3b3b2cc9c273d7de4a685e162 100644 (file)
--- a/tests/data/test59
+++ b/tests/data/test59
@@ -23,10 +23,10 @@ hej
 <server>
 http
 </server>
- <name>
+<name>
 HTTP URL with slash but with "parameter"
- </name>
- <command>
+</name>
+<command>
 "http://%HOSTIP:%HTTPPORT?mooo/%TESTNUMBER"
 </command>
 </client>

diff --git a/tests/data/test591 b/tests/data/test591
index 528660145e76cfa171053642a297d479ba0b8d71..d1cbf082a4facf2aaba05b8301d4f1f8b3f20d5a 100644 (file)
--- a/tests/data/test591
+++ b/tests/data/test591
@@ -33,10 +33,10 @@ ftp
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 FTP multi PORT and 425 on upload
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %FTPTIME2 %LOGDIR/upload%TESTNUMBER
 </command>
 <file name="%LOGDIR/upload%TESTNUMBER">

diff --git a/tests/data/test592 b/tests/data/test592
index e3a9147be7282e2c6c188f13f4d4038b07cce664..f77eb9a870696ab574be93b943d89f7e99519665 100644 (file)
--- a/tests/data/test592
+++ b/tests/data/test592
@@ -33,10 +33,10 @@ ftp
 <tool>
 lib591
 </tool>
- <name>
+<name>
 FTP multi PORT and 421 on upload
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %FTPTIME2 %LOGDIR/upload%TESTNUMBER
 </command>
 <file name="%LOGDIR/upload%TESTNUMBER">

diff --git a/tests/data/test593 b/tests/data/test593
index 53a884a0fd2ef9c084aef64d93ef1634113c2acf..9a15a5184e926c5f00f9bbf11eb1d27bdd59eb97 100644 (file)
--- a/tests/data/test593
+++ b/tests/data/test593
@@ -33,10 +33,10 @@ ftp
 <tool>
 lib591
 </tool>
- <name>
+<name>
 FTP multi PORT upload, no data conn and no transient neg. reply
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %FTPTIME2 %LOGDIR/upload%TESTNUMBER
 </command>
 <file name="%LOGDIR/upload%TESTNUMBER">

diff --git a/tests/data/test594 b/tests/data/test594
index dab35062b0b0ad7c26b68bcc4335fd1b7dc5f305..cd98f0b9d8a4cf8489d26a7cdf6435cd1979c9e8 100644 (file)
--- a/tests/data/test594
+++ b/tests/data/test594
@@ -35,10 +35,10 @@ ftp
 <tool>
 lib591
 </tool>
- <name>
+<name>
 FTP multi PORT upload, no data conn and no positive prelim. reply
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %FTPTIME2 %LOGDIR/upload%TESTNUMBER
 </command>
 <file name="%LOGDIR/upload%TESTNUMBER">

diff --git a/tests/data/test595 b/tests/data/test595
index f979746d704fd27aa01028326adb0a38ba14be8b..40ace13d5e90782a296f6b6aaa76133cad4e7677 100644 (file)
--- a/tests/data/test595
+++ b/tests/data/test595
@@ -32,10 +32,10 @@ ftp
 lib585
 </tool>
 
- <name>
+<name>
 verify close callbacks with passive FTP
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test596 b/tests/data/test596
index 27d5d849ecfda20ab5930d5aa607b2c5d718e0de..7175c63f8adf3f9481606f16e51592e7a2030948 100644 (file)
--- a/tests/data/test596
+++ b/tests/data/test596
@@ -32,10 +32,10 @@ ftp
 lib585
 </tool>
 
- <name>
+<name>
 verify close callbacks with active FTP
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER activeftp
 </command>
 </client>

diff --git a/tests/data/test597 b/tests/data/test597
index 6ab57887795c9732fc68f2618e31a776c6c7aa73..5402d29b1ff96bce6e882ff4a18bf75cbe0298f6 100644 (file)
--- a/tests/data/test597
+++ b/tests/data/test597
@@ -14,9 +14,9 @@ ftp
 <tool>
 lib%TESTNUMBER
 </tool>
- <name>
+<name>
 FTP connect only option
- </name>
+</name>
 
 <command>
 ftp://%HOSTIP:%FTPPORT

diff --git a/tests/data/test598 b/tests/data/test598
index a000dca55b7a5405f683f1d5fa3284a4046d4cc6..7a6601b9afc6fead2c7235a833448e8b9f311170 100644 (file)
--- a/tests/data/test598
+++ b/tests/data/test598
@@ -52,10 +52,10 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 curl_easy_reset with referer and other strings set
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 <features>

diff --git a/tests/data/test599 b/tests/data/test599
index 9ca266a3ea28adb09c5421ce6cbe8876f706e62a..5d334e070b2d6b6d573bf4b876f38239f3fba1a2 100644 (file)
--- a/tests/data/test599
+++ b/tests/data/test599
@@ -68,10 +68,10 @@ lib%TESTNUMBER
 
 # Bug 3510057 pointed out that when following a location to a larger chunked
 # encoded page, the first size would still be used in the progress callback
- <name>
+<name>
 HTTP GET with progress callback and redirects changing content sizes
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test6 b/tests/data/test6
index 6e83125cd4cbde9fc7c2cf43698e162885965870..9c5db36d990d80f6d27df09b9f9d246151b76a80 100644 (file)
--- a/tests/data/test6
+++ b/tests/data/test6
@@ -25,10 +25,10 @@ swsclose: booo
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with simple cookie send
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER -b "name=contents;name2=content2" -b name3=content3
 </command>
 <features>

diff --git a/tests/data/test60 b/tests/data/test60
index d23918ba88ad57b9d0666160183817e74a8a432b..14338b44010ddd13715f839bb62ab7f2e627b220 100644 (file)
--- a/tests/data/test60
+++ b/tests/data/test60
@@ -27,7 +27,7 @@ http
 <name>
 HTTP PUT from stdin with wrong content-length
 </name>
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/bzz/%TESTNUMBER -T - -H "Content-Length: 1"
 </command>
 <stdin>

diff --git a/tests/data/test600 b/tests/data/test600
index d110ad15a5c7b35bfce431ff4a77e641a2e86428..f2d6510ab39e96985fed96055741cb73e98891e5 100644 (file)
--- a/tests/data/test600
+++ b/tests/data/test600
@@ -20,10 +20,10 @@ for ssh test
 <server>
 sftp
 </server>
- <name>
+<name>
 SFTP retrieval
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure
 </command>
 <file name="%LOGDIR/file%TESTNUMBER.txt">

diff --git a/tests/data/test601 b/tests/data/test601
index 73428decb6af99856b791aae557d8bccc4ef8b15..1f01ffd878493a0fb69493da352e2be970250979 100644 (file)
--- a/tests/data/test601
+++ b/tests/data/test601
@@ -20,10 +20,10 @@ for ssh test
 <server>
 scp
 </server>
- <name>
+<name>
 SCP retrieval
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure
 </command>
 <file name="%LOGDIR/file%TESTNUMBER.txt">

diff --git a/tests/data/test602 b/tests/data/test602
index 2c896597890dc15e3beaf0c851ebd948bb955a6b..8894c096cfa95543daf40c90358466212aed74bc 100644 (file)
--- a/tests/data/test602
+++ b/tests/data/test602
@@ -17,10 +17,10 @@ SFTP put
 <server>
 sftp
 </server>
- <name>
+<name>
 SFTP put
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -T %LOGDIR/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/upload.%TESTNUMBER --insecure
 </command>
 <file name="%LOGDIR/file%TESTNUMBER.txt">

diff --git a/tests/data/test603 b/tests/data/test603
index 7aa20a999d7bde68d27272c50af01d3532ed101e..e98b73d110f81953a6635c9b83c75e41e9c1e193 100644 (file)
--- a/tests/data/test603
+++ b/tests/data/test603
@@ -17,10 +17,10 @@ SCP upload
 <server>
 scp
 </server>
- <name>
+<name>
 SCP upload
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -T %LOGDIR/file%TESTNUMBER.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/upload.%TESTNUMBER --insecure
 </command>
 <file name="%LOGDIR/file%TESTNUMBER.txt">

diff --git a/tests/data/test604 b/tests/data/test604
index 14d79335d788a7877d9fac229ffb2b76de5849cd..9e129ae5a64569bb62d732855518e8853a53a4c8 100644 (file)
--- a/tests/data/test604
+++ b/tests/data/test604
@@ -12,10 +12,10 @@ FAILURE
 <server>
 sftp
 </server>
- <name>
+<name>
 SFTP retrieval of nonexistent file
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/not-a-valid-file-moooo --insecure
 </command>
 </client>

diff --git a/tests/data/test605 b/tests/data/test605
index 5c9a2667482060c5574b4d8619c2a477de2be99f..380b77a7509a29beacd9494bea2920db01bc9890 100644 (file)
--- a/tests/data/test605
+++ b/tests/data/test605
@@ -12,10 +12,10 @@ FAILURE
 <server>
 scp
 </server>
- <name>
+<name>
 SCP retrieval of nonexistent file
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/not-a-valid-file-moooo --insecure
 </command>
 </client>

diff --git a/tests/data/test606 b/tests/data/test606
index 92764118db70fdd00847a4a549cc24ce31b61deb..85c462f0f01476f5abf53bd990e9ad734b4f84c6 100644 (file)
--- a/tests/data/test606
+++ b/tests/data/test606
@@ -12,10 +12,10 @@ FAILURE
 <server>
 sftp
 </server>
- <name>
+<name>
 SFTP invalid user login
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u not-a-valid-user: sftp://%HOSTIP:%SSHPORT%SSH_PWD/not-a-valid-file-moooo --insecure
 </command>
 </client>

diff --git a/tests/data/test607 b/tests/data/test607
index 317f56b9cb72c47ef0b3a0ca3f29986454f03968..091a73e4c3517e0fb88d5b6a5abb71fe2803a1f3 100644 (file)
--- a/tests/data/test607
+++ b/tests/data/test607
@@ -12,10 +12,10 @@ FAILURE
 <server>
 scp
 </server>
- <name>
+<name>
 SCP invalid user login
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u not-a-valid-user: scp://%HOSTIP:%SSHPORT%SSH_PWD/not-a-valid-file-moooo --insecure
 </command>
 </client>

diff --git a/tests/data/test608 b/tests/data/test608
index 5b0bf190092d76db43c2027dfc9754591124411b..157713e37877e7bd76601f054cd4a027b2ba09a0 100644 (file)
--- a/tests/data/test608
+++ b/tests/data/test608
@@ -20,10 +20,10 @@ Test file for rename test
 <server>
 sftp
 </server>
- <name>
+<name>
 SFTP post-quote rename
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-rename %PWD/%LOGDIR/file%TESTNUMBER.txt %PWD/%LOGDIR/file%TESTNUMBER-renamed.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure
 </command>
 # Verify that the file was renamed properly, then rename the file back to what

diff --git a/tests/data/test609 b/tests/data/test609
index 631aa62e0c7a2f3cb3a45c3ed21bbbbbaa840e16..3b9668552d6ecde4000498819d583d18f555c872 100644 (file)
--- a/tests/data/test609
+++ b/tests/data/test609
@@ -21,10 +21,10 @@ Test file for mkdir test
 <server>
 sftp
 </server>
- <name>
+<name>
 SFTP post-quote mkdir failure
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-mkdir %PWD/%LOGDIR/file%TESTNUMBER.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure
 </command>
 <file name="%LOGDIR/file%TESTNUMBER.txt">

diff --git a/tests/data/test61 b/tests/data/test61
index 18e02eb54bbc24b72787ec40932f0ccd7d52f6dc..43a8598babf4a279d10eb1d6a673d014e3ecf53a 100644 (file)
--- a/tests/data/test61
+++ b/tests/data/test61
@@ -40,16 +40,16 @@ boo
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with various cookies and custom Host:
- </name>
+</name>
 # Explicitly set the time zone to a known good one, in case the user is
 # using one of the 'right' zones that take into account leap seconds
 # which causes the cookie expiry times to be different.
 <setenv>
 TZ=GMT
 </setenv>
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -c %LOGDIR/jar%TESTNUMBER.txt -H "Host: www.host.foo.com"
 </command>
 <features>

diff --git a/tests/data/test610 b/tests/data/test610
index b3599a2f4ffd0ab0064c167f19192e231f7eca28..0ca51f73c86b5793888f487dbef896f489600528 100644 (file)
--- a/tests/data/test610
+++ b/tests/data/test610
@@ -23,10 +23,10 @@ sftp
 <precheck>
 perl %SRCDIR/libtest/test%TESTNUMBER.pl mkdir %PWD/%LOGDIR/test%TESTNUMBER.dir
 </precheck>
- <name>
+<name>
 SFTP post-quote rmdir
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-rmdir %PWD/%LOGDIR/test%TESTNUMBER.dir" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure
 </command>
 <postcheck>

diff --git a/tests/data/test611 b/tests/data/test611
index fd9f42fa0e4391ebb23c8119692d8a2a78ad4386..dc75e20d462397bd936fc563cbdf8ae246b76acd 100644 (file)
--- a/tests/data/test611
+++ b/tests/data/test611
@@ -23,10 +23,10 @@ sftp
 <precheck>
 perl %SRCDIR/libtest/test610.pl mkdir %PWD/%LOGDIR/test%TESTNUMBER.dir
 </precheck>
- <name>
+<name>
 SFTP post-quote rename
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-rename %PWD/%LOGDIR/test%TESTNUMBER.dir %PWD/%LOGDIR/test%TESTNUMBER.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure
 </command>
 <postcheck>

diff --git a/tests/data/test612 b/tests/data/test612
index 37ffc5c6cd271e08bb54bf60eb5b86aa51641a5a..2c43f6a0d782a52e9e3e82c363d8d88e89cd3d67 100644 (file)
--- a/tests/data/test612
+++ b/tests/data/test612
@@ -20,10 +20,10 @@ Dummy test file for remove test
 <server>
 sftp
 </server>
- <name>
+<name>
 SFTP post-quote remove file
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -T %LOGDIR/file%TESTNUMBER.txt -Q "-rm %PWD/%LOGDIR/file%TESTNUMBER.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/upload.%TESTNUMBER  --insecure
 </command>
 <postcheck>

diff --git a/tests/data/test613 b/tests/data/test613
index 8a57ec663dd40c4afe0469618c21956802c71dd1..f8443efa3670a857ad00d423ce59f8d2275e4006 100644 (file)
--- a/tests/data/test613
+++ b/tests/data/test613
@@ -25,10 +25,10 @@ sftp
 <precheck>
 perl %SRCDIR/libtest/test%TESTNUMBER.pl prepare %PWD/%LOGDIR/test%TESTNUMBER.dir
 </precheck>
- <name>
+<name>
 SFTP directory retrieval
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.dir/ --insecure
 </command>
 <postcheck>

diff --git a/tests/data/test614 b/tests/data/test614
index d7b45a459ae338b780889ef5593f799f441624f8..012d6ceecbb6bdd9a1bdbc03bdb4d9f36372d79c 100644 (file)
--- a/tests/data/test614
+++ b/tests/data/test614
@@ -26,10 +26,10 @@ sftp
 <precheck>
 perl %SRCDIR/libtest/test613.pl prepare %PWD/%LOGDIR/test%TESTNUMBER.dir
 </precheck>
- <name>
+<name>
 SFTP pre-quote chmod
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "chmod 444 %PWD/%LOGDIR/test%TESTNUMBER.dir/plainfile.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.dir/ --insecure
 </command>
 <postcheck>

diff --git a/tests/data/test615 b/tests/data/test615
index d2ed914a69ea1570a7f31f75e194847ad3e646f7..4626d3f1e49f0f4723bfc3193ca8ed755eb32117 100644 (file)
--- a/tests/data/test615
+++ b/tests/data/test615
@@ -16,10 +16,10 @@ sftp
 <precheck>
 perl %SRCDIR/libtest/test613.pl prepare %PWD/%LOGDIR/test%TESTNUMBER.dir
 </precheck>
- <name>
+<name>
 SFTP put remote failure
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -T %LOGDIR/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.dir/rofile.txt --insecure
 </command>
 <postcheck>

diff --git a/tests/data/test616 b/tests/data/test616
index 570f1fa11e14a867ff1d488a7a7b3088561e5e23..0ebc734349f5d4eb4ec56b3c860bd72da7debfab 100644 (file)
--- a/tests/data/test616
+++ b/tests/data/test616
@@ -19,10 +19,10 @@ zero-length
 <server>
 sftp
 </server>
- <name>
+<name>
 SFTP retrieval of empty file
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure
 </command>
 <file name="%LOGDIR/file%TESTNUMBER.txt">

diff --git a/tests/data/test617 b/tests/data/test617
index 05c2989b7e5983e04e1b70748b29c0bb4be1c251..0ab6ced01fde5a450f8fd7a60f3f4d51c7efdeb4 100644 (file)
--- a/tests/data/test617
+++ b/tests/data/test617
@@ -19,10 +19,10 @@ zero-length
 <server>
 scp
 </server>
- <name>
+<name>
 SCP retrieval of empty file
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure
 </command>
 <file name="%LOGDIR/file%TESTNUMBER.txt">

diff --git a/tests/data/test618 b/tests/data/test618
index 1ffe464483af3fb2e9471ccc5cf8cc6a5e5d58d7..2094768f30c281b6fc3699d09ce340b4f8d2a8c3 100644 (file)
--- a/tests/data/test618
+++ b/tests/data/test618
@@ -11,10 +11,10 @@ SFTP
 <server>
 sftp
 </server>
- <name>
+<name>
 SFTP retrieval of two files
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure
 </command>
 <file name="%LOGDIR/file%TESTNUMBER.txt">

diff --git a/tests/data/test619 b/tests/data/test619
index 15309a2579df3a3af9d84475ae4e8330a475242e..6c3296c92db4e5be53a00ee2fb839d2d2b18715e 100644 (file)
--- a/tests/data/test619
+++ b/tests/data/test619
@@ -11,10 +11,10 @@ SCP
 <server>
 scp
 </server>
- <name>
+<name>
 SCP retrieval of two files
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure
 </command>
 <file name="%LOGDIR/file%TESTNUMBER.txt">

diff --git a/tests/data/test62 b/tests/data/test62
index 4f3fa2383aaa816338e2ca8b24a31be3ed040467..97cef4afacce5172160f6c8132561cc939eb6c26 100644 (file)
--- a/tests/data/test62
+++ b/tests/data/test62
@@ -25,10 +25,10 @@ boo
 <server>
 http
 </server>
- <name>
+<name>
 HTTP, send cookies when using custom Host:
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER?hoge=fuga -b %LOGDIR/jar%TESTNUMBER.txt -H "Host: www.host.foo.com"
 </command>
 <file name="%LOGDIR/jar%TESTNUMBER.txt">

diff --git a/tests/data/test620 b/tests/data/test620
index 2dd3587346dab30b4bc58cd984a1a8b421985e24..0f32d6fdf444747d57393908d7e2c1ad5af82a15 100644 (file)
--- a/tests/data/test620
+++ b/tests/data/test620
@@ -12,10 +12,10 @@ FAILURE
 <server>
 sftp
 </server>
- <name>
+<name>
 SFTP retrieval of missing file followed by good file
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/not-a-valid-file-moooo sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure
 </command>
 <file name="%LOGDIR/file%TESTNUMBER.txt">

diff --git a/tests/data/test621 b/tests/data/test621
index 0c65b13d03e219f64973d67c14c99253729c14d6..cafd808959161304c945e10fea7ac75a508bf14b 100644 (file)
--- a/tests/data/test621
+++ b/tests/data/test621
@@ -12,10 +12,10 @@ FAILURE
 <server>
 scp
 </server>
- <name>
+<name>
 SCP retrieval of missing file followed by good file
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/not-a-valid-file-moooo scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure
 </command>
 <file name="%LOGDIR/file%TESTNUMBER.txt">

diff --git a/tests/data/test622 b/tests/data/test622
index 530bd2207a56cd795091b92f15bf2b8219879dd9..014ea96d9ef5c94e778d161d4dd301801971ad55 100644 (file)
--- a/tests/data/test622
+++ b/tests/data/test622
@@ -18,10 +18,10 @@ FAILURE
 <server>
 sftp
 </server>
- <name>
+<name>
 SFTP put failure
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -T %LOGDIR/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/nonexistent-directory/nonexistent-file --insecure
 </command>
 <file name="%LOGDIR/file%TESTNUMBER.txt">

diff --git a/tests/data/test623 b/tests/data/test623
index 794a25118cd3c4383ecd7dbde32826e30011f466..945079b3f3d6790b1ead3f349dac82bc5cf59d90 100644 (file)
--- a/tests/data/test623
+++ b/tests/data/test623
@@ -18,10 +18,10 @@ FAILURE
 <server>
 scp
 </server>
- <name>
+<name>
 SCP upload failure
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -T %LOGDIR/file%TESTNUMBER.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/nonexistent-directory/nonexistent-file --insecure
 </command>
 <file name="%LOGDIR/file%TESTNUMBER.txt">

diff --git a/tests/data/test624 b/tests/data/test624
index fa7225d68baac09cdf7e5d101bcbbfd7f1d90fd7..3a4ca4b32c8e6bc82aea2ef0d5574bd63d6ebdfd 100644 (file)
--- a/tests/data/test624
+++ b/tests/data/test624
@@ -18,10 +18,10 @@ SFTP put
 <server>
 sftp
 </server>
- <name>
+<name>
 SFTP put with --ftp-create-dirs
- </name>
- <command>
+</name>
+<command>
 --ftp-create-dirs --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -T %LOGDIR/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.dir/upload.%TESTNUMBER --insecure
 </command>
 <postcheck>

diff --git a/tests/data/test625 b/tests/data/test625
index 6ca9f4ea7e51816e633aafdbe6e60fdcb39b0283..ff7549477a6081617206b60726da19c524ab2b5a 100644 (file)
--- a/tests/data/test625
+++ b/tests/data/test625
@@ -18,10 +18,10 @@ SFTP put
 <server>
 sftp
 </server>
- <name>
+<name>
 SFTP put with --ftp-create-dirs twice
- </name>
- <command>
+</name>
+<command>
 --ftp-create-dirs --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -T %LOGDIR/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.a/upload.%TESTNUMBER -T %LOGDIR/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.b/upload.%TESTNUMBER --insecure
 </command>
 <postcheck>

diff --git a/tests/data/test626 b/tests/data/test626
index 87b7944edc31d2736d30a74fbd6011bada13cf3a..b963b6dedf8a1ffd82e5ab9e1df3912b399c9316 100644 (file)
--- a/tests/data/test626
+++ b/tests/data/test626
@@ -18,10 +18,10 @@ FAILURE
 <server>
 sftp
 </server>
- <name>
+<name>
 SFTP invalid quote command
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "invalid-command foo bar" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure
 </command>
 <file name="%LOGDIR/file%TESTNUMBER.txt">

diff --git a/tests/data/test627 b/tests/data/test627
index 98b563fc7f0e47f990a5f072ce8e6c18d5fe288d..8ebdc123c00b37d16f30d4052ac7d39264b469ec 100644 (file)
--- a/tests/data/test627
+++ b/tests/data/test627
@@ -20,10 +20,10 @@ NOBODY
 <server>
 sftp
 </server>
- <name>
+<name>
 SFTP quote remove file with NOBODY
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -I -Q "rm %PWD/%LOGDIR/file%TESTNUMBER.txt" sftp://%HOSTIP:%SSHPORT --insecure
 </command>
 <postcheck>

diff --git a/tests/data/test628 b/tests/data/test628
index 86c00f16d722a27c66288508bdf8a88d2d58e624..755181e319a5f420a009cdd5175ca54165d0d7fa 100644 (file)
--- a/tests/data/test628
+++ b/tests/data/test628
@@ -12,10 +12,10 @@ FAILURE
 <server>
 sftp
 </server>
- <name>
+<name>
 SFTP invalid user login (password authentication)
- </name>
- <command>
+</name>
+<command>
 -u not-a-valid-user: sftp://%HOSTIP:%SSHPORT%SSH_PWD/irrelevant-file  --insecure
 </command>
 </client>

diff --git a/tests/data/test629 b/tests/data/test629
index 07ac767ab24b97dae843609e3af47444849961b8..6bf42f4a6c14665ecb7f587309d819c0b350d876 100644 (file)
--- a/tests/data/test629
+++ b/tests/data/test629
@@ -12,10 +12,10 @@ FAILURE
 <server>
 scp
 </server>
- <name>
+<name>
 SCP invalid user login (password authentication)
- </name>
- <command>
+</name>
+<command>
 -u not-a-valid-user: scp://%HOSTIP:%SSHPORT%SSH_PWD/irrelevant-file --insecure
 </command>
 </client>

diff --git a/tests/data/test63 b/tests/data/test63
index bf8ebfcf85e09bf183d174fcaefb38cb6f76465b..3a7e015fd3560431a2c2551eb94f0e204d84f228 100644 (file)
--- a/tests/data/test63
+++ b/tests/data/test63
@@ -24,13 +24,13 @@ the content would go here
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with proxy authorization set in environment
- </name>
+</name>
 <setenv>
 http_proxy=http://fake:user@%HOSTIP:%HTTPPORT/
 </setenv>
- <command>
+<command>
 http://we.want.that.site.com/%TESTNUMBER
 </command>
 <features>

diff --git a/tests/data/test630 b/tests/data/test630
index 0aed489aa9aa33340de5d18a455b988b438bb312..8a5c443883136d322047f9bdb22fe3fb1249f791 100644 (file)
--- a/tests/data/test630
+++ b/tests/data/test630
@@ -13,10 +13,10 @@ server key check
 <server>
 sftp
 </server>
- <name>
+<name>
 SFTP incorrect host key
- </name>
- <command>
+</name>
+<command>
 --hostpubmd5 00000000000000000000000000000000 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/irrelevant-file --insecure
 </command>
 </client>

diff --git a/tests/data/test631 b/tests/data/test631
index 4e0630724f020006f6441832cd5ab10f4fd75050..ebf661440a9a1045ba60bd6a0e9e85b93e9e9dc7 100644 (file)
--- a/tests/data/test631
+++ b/tests/data/test631
@@ -13,10 +13,10 @@ server key check
 <server>
 scp
 </server>
- <name>
+<name>
 SCP incorrect host key
- </name>
- <command>
+</name>
+<command>
 --hostpubmd5 00000000000000000000000000000000 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/irrelevant-file --insecure
 </command>
 </client>

diff --git a/tests/data/test632 b/tests/data/test632
index 8e3a913b04b5c35236bf6c77021cd6bc82ed76d5..475ab2728b6d908e3e606aaf4de70df2d8fa1d24 100644 (file)
--- a/tests/data/test632
+++ b/tests/data/test632
@@ -16,10 +16,10 @@ none
 <features>
 sftp
 </features>
- <name>
+<name>
 SFTP syntactically invalid host key
- </name>
- <command>
+</name>
+<command>
 --hostpubmd5 00 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%NOLISTENPORT%SSH_PWD/%LOGDIR/irrelevant-file --insecure
 </command>
 </client>

diff --git a/tests/data/test633 b/tests/data/test633
index df3403cc8039cd1cf5db155b8628ea9a6f5b3513..8f8c4352dcb79c320ffe5387f85a1145eaa6327f 100644 (file)
--- a/tests/data/test633
+++ b/tests/data/test633
@@ -20,10 +20,10 @@ data
 <server>
 sftp
 </server>
- <name>
+<name>
 SFTP retrieval with byte range
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt -r 5-9 --insecure
 </command>
 <file name="%LOGDIR/file%TESTNUMBER.txt">

diff --git a/tests/data/test634 b/tests/data/test634
index 3ba7fc6715c40d215990970aac23a3115c0925c5..3669a8bf992b55aaf248bfdae65ac3d2a7c8362d 100644 (file)
--- a/tests/data/test634
+++ b/tests/data/test634
@@ -21,10 +21,10 @@ for ssh test
 <server>
 sftp
 </server>
- <name>
+<name>
 SFTP retrieval with byte range past end of file
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt -r 5-99 --insecure
 </command>
 <file name="%LOGDIR/file%TESTNUMBER.txt">

diff --git a/tests/data/test635 b/tests/data/test635
index 5cdf3420dff64511a6756675b5007f4d4c7dd37d..b07b5c82371db475f840bcd2a0a00206d068de53 100644 (file)
--- a/tests/data/test635
+++ b/tests/data/test635
@@ -20,10 +20,10 @@ ssh test
 <server>
 sftp
 </server>
- <name>
+<name>
 SFTP retrieval with byte range relative to end of file
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt -r -9 --insecure
 </command>
 <file name="%LOGDIR/file%TESTNUMBER.txt">

diff --git a/tests/data/test636 b/tests/data/test636
index 8afa222f7e7eb93088c79286df4ba8232c0a8a7d..96ffc0c136ca236e6d48f6c6f7387db97c8e1355 100644 (file)
--- a/tests/data/test636
+++ b/tests/data/test636
@@ -21,10 +21,10 @@ for ssh test
 <server>
 sftp
 </server>
- <name>
+<name>
 SFTP retrieval with X- byte range
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt -r 5- --insecure
 </command>
 <file name="%LOGDIR/file%TESTNUMBER.txt">

diff --git a/tests/data/test637 b/tests/data/test637
index 77d1ed9c6b41e5af383fe1aef5ee03b48a3dddd5..df80c483a015a24e76c9fc1cb2b38d0ec4ffc496 100644 (file)
--- a/tests/data/test637
+++ b/tests/data/test637
@@ -19,10 +19,10 @@ Range
 <server>
 sftp
 </server>
- <name>
+<name>
 SFTP retrieval with invalid X- range
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt -r 99- --insecure
 </command>
 <file name="%LOGDIR/file%TESTNUMBER.txt">

diff --git a/tests/data/test638 b/tests/data/test638
index 10b1b4ff97c3d41f54d2388bbd0f376247bc32ff..b41a3aecf8af25d1c6da8ee0a6e5f7c755973d81 100644 (file)
--- a/tests/data/test638
+++ b/tests/data/test638
@@ -25,10 +25,10 @@ sftp
 <precheck>
 perl %SRCDIR/libtest/test610.pl mkdir %PWD/%LOGDIR/test%TESTNUMBER.dir
 </precheck>
- <name>
+<name>
 SFTP post-quote rename * asterisk accept-fail
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-*rename %PWD/%LOGDIR/test%TESTNUMBER.dir %PWD/%LOGDIR/test%TESTNUMBER.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure
 </command>
 <postcheck>

diff --git a/tests/data/test639 b/tests/data/test639
index 3c6f50bd71fe6b050137839ea3c21404eeb22333..8105798fd40733fc35d278a018766a836c0cb1a2 100644 (file)
--- a/tests/data/test639
+++ b/tests/data/test639
@@ -25,10 +25,10 @@ sftp
 <precheck>
 perl %SRCDIR/libtest/test610.pl mkdir %PWD/%LOGDIR/test%TESTNUMBER.dir
 </precheck>
- <name>
+<name>
 SFTP post-quote rename * asterisk accept-fail
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-*rename %PWD/%LOGDIR/test%TESTNUMBER-not-exists-dir %PWD/%LOGDIR/test%TESTNUMBER.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure
 </command>
 <postcheck>

diff --git a/tests/data/test64 b/tests/data/test64
index 8067f1a8589fcbff61fa11ce58fb62faa2e49c29..0f0516ea4ba6decb7d531c2a75dba338cb5eb1f2 100644 (file)
--- a/tests/data/test64
+++ b/tests/data/test64
@@ -55,10 +55,10 @@ http
 !SSPI
 crypto
 </features>
- <name>
+<name>
 HTTP with Digest authorization
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
 </command>
 </client>

diff --git a/tests/data/test640 b/tests/data/test640
index 816dfd537d2d94b3a9728da51b3e3eb6ae949c7e..ecfc0934fd981bc3ea59a566d2215c458695938a 100644 (file)
--- a/tests/data/test640
+++ b/tests/data/test640
@@ -19,10 +19,10 @@ NOBODY
 <server>
 sftp
 </server>
- <name>
+<name>
 SFTP --head retrieval
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure --head
 </command>
 <file name="%LOGDIR/file%TESTNUMBER.txt">

diff --git a/tests/data/test641 b/tests/data/test641
index 3487c90ce39aa31133c1873f052532d4184d589a..828198b445acd582e330bbe70fbdf134ac38dde8 100644 (file)
--- a/tests/data/test641
+++ b/tests/data/test641
@@ -19,10 +19,10 @@ NOBODY
 <server>
 scp
 </server>
- <name>
+<name>
 SCP --head retrieval
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure --head
 </command>
 <file name="%LOGDIR/file%TESTNUMBER.txt">

diff --git a/tests/data/test642 b/tests/data/test642
index f63bbc66032fc9e0a6b0108afb89342054eccefb..ccb0c605d3ea172add97f535ed777248fdf064df 100644 (file)
--- a/tests/data/test642
+++ b/tests/data/test642
@@ -20,10 +20,10 @@ for ssh test
 <server>
 sftp
 </server>
- <name>
+<name>
 SFTP retrieval
- </name>
- <command>
+</name>
+<command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: --compressed-ssh sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure
 </command>
 <file name="%LOGDIR/file%TESTNUMBER.txt">

diff --git a/tests/data/test643 b/tests/data/test643
index 5bb32f4c8fd09c07799dcda1344fbff8c7ab5681..400d1b9ca528b2a4f692aa43e477bac2b6e180cb 100644 (file)
--- a/tests/data/test643
+++ b/tests/data/test643
@@ -50,10 +50,10 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 HTTP multi-part mimepost using read callback for the file part
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test645 b/tests/data/test645
index 971ce5d34b74a0a3966fd4e1756032f415e4bcdc..82ee1d0a2ae788c943676d4f7e3727329643dd9a 100644 (file)
--- a/tests/data/test645
+++ b/tests/data/test645
@@ -50,10 +50,10 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 HTTP multi-part chunked mimepost using read callback for the file part
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test646 b/tests/data/test646
index f4f1e8828b93f834c034b397c30f10611f89504d..4f26dbdf9291ab3d47b8a72d5c559f66ff3dd579 100644 (file)
--- a/tests/data/test646
+++ b/tests/data/test646
@@ -20,16 +20,16 @@ Mime
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP multipart using mime API
- </name>
+</name>
 <stdin>
 From: different\r
 To: another\r
 \r
 body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -F "=(;type=multipart/alternative" -F "= <body>This is the html version</body>;headers=X-test1: this is a header;type=text/html;headers=X-test2: this is another header " -F "=This is the plain text version;headers=@%LOGDIR/headers%TESTNUMBER" -F "=)" -F "=@%LOGDIR/test%TESTNUMBER.txt;headers=<%LOGDIR/headers%TESTNUMBER" -H "From: different" -H "To: another" -H "Reply-To: <followup@example.com>"
 </command>
 <file1 name="%LOGDIR/test%TESTNUMBER.txt">

diff --git a/tests/data/test647 b/tests/data/test647
index 5f96a161980c514ed0ae2c5bc191e97af7c5d417..d34fe21f74272f279c203ec91a56f21af26d4d54 100644 (file)
--- a/tests/data/test647
+++ b/tests/data/test647
@@ -21,10 +21,10 @@ Mime
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP APPEND multipart using mime API
- </name>
- <command>
+</name>
+<command>
 imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -F "=(;type=multipart/alternative" -F "= <body>This is the html version</body>;type=text/html" -F "=This is the plain text version" -F "=)" -F "=@%LOGDIR/test%TESTNUMBER.txt" -H "Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST)" -H "From: Fred Foobar <foobar@example.com>" -H "To: joe@example.com" -H "Message-Id: <B27397-0100000@example.com>" -H "Subject: afternoon meeting" -u user:secret
 </command>
 <file name="%LOGDIR/test%TESTNUMBER.txt">

diff --git a/tests/data/test648 b/tests/data/test648
index 5306552a6de8e68cb00832a224f26b80fe49779f..992a3dbc5ed95c7262820bbfa7a0aba6e1211d29 100644 (file)
--- a/tests/data/test648
+++ b/tests/data/test648
@@ -20,16 +20,16 @@ Mime
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP multipart with transfer content encoders
- </name>
+</name>
 <stdin>
 From: different\r
 To: another\r
 \r
 body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -F '=This is the email inline text with a very long line containing the special character = and that should be split by encoder.;headers=Content-disposition: "inline";encoder=quoted-printable' -F "=@%LOGDIR/test%TESTNUMBER.txt;encoder=base64" -H "From: different" -H "To: another"
 </command>
 <file name="%LOGDIR/test%TESTNUMBER.txt">

diff --git a/tests/data/test649 b/tests/data/test649
index 753c847aae4a55de5c52bf6fce042f4b91313e40..7751e38f1673867b1100a0d019b8a223f71d5068 100644 (file)
--- a/tests/data/test649
+++ b/tests/data/test649
@@ -20,16 +20,16 @@ Mime
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP multipart with 7bit encoder error
- </name>
+</name>
 <stdin>
 From: different\r
 To: another\r
 \r
 body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -F '=This is valid;encoder=7bit' -F "=@%LOGDIR/test%TESTNUMBER.txt;encoder=7bit" -H "From: different" -H "To: another"
 </command>
 <file name="%LOGDIR/test%TESTNUMBER.txt">

diff --git a/tests/data/test65 b/tests/data/test65
index f1ce72bb219a983ff3447fb5f5d5a132835fde43..fcf43563fc7d665e972aae1455196ef12eae73d5 100644 (file)
--- a/tests/data/test65
+++ b/tests/data/test65
@@ -55,10 +55,10 @@ http
 !SSPI
 crypto
 </features>
- <name>
+<name>
 HTTP with Digest authorization with bad password
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:test2pass --digest
 </command>
 </client>

diff --git a/tests/data/test650 b/tests/data/test650
index 7aa88ab2d99de353e73faebb4741288676fabaee..02876fbca1315dea63c54d6c06a37fe445a57d23 100644 (file)
--- a/tests/data/test650
+++ b/tests/data/test650
@@ -45,13 +45,13 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 HTTP formpost using form API - with redirect and re-POST
- </name>
+</name>
 <stdin>
  Some data from stdin
 </stdin>
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/test%TESTNUMBER.filedata
 </command>
 <file name="%LOGDIR/test%TESTNUMBER.filedata">

diff --git a/tests/data/test651 b/tests/data/test651
index bf96b1b0ba0cb87f76b10b6b0ed7497686fea3eb..48e42df6174dfefd3e94c33fc56dcf3573fa7496 100644 (file)
--- a/tests/data/test651
+++ b/tests/data/test651
@@ -34,13 +34,13 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 curl_formadd with huge COPYCONTENTS
- </name>
+</name>
 <stdin>
  Some data from stdin
 </stdin>
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/test%TESTNUMBER.filedata
 </command>
 <file name="%LOGDIR/test%TESTNUMBER.filedata">

diff --git a/tests/data/test652 b/tests/data/test652
index 25cbd4242925500f51143a4392c9ea4443a4c6ee..31ec7b821daa6caef5462f6adfdd2852d5358d64 100644 (file)
--- a/tests/data/test652
+++ b/tests/data/test652
@@ -24,10 +24,10 @@ smtp
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 SMTP with encoded huge mime data contents
- </name>
- <command>
+</name>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test653 b/tests/data/test653
index 58c0748ba5a255e91e19a900f77b8105582cd03e..33885f17faaab01d655d94a07f7e05fd38ba6ebd 100644 (file)
--- a/tests/data/test653
+++ b/tests/data/test653
@@ -50,10 +50,10 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 Reuse of handle after altering mime data
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test654 b/tests/data/test654
index e022dc529c5d9df75aaccd321c42fda48590817a..47415e209be4a1bf4c1aab1b6f3a12762fa474ee 100644 (file)
--- a/tests/data/test654
+++ b/tests/data/test654
@@ -50,10 +50,10 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 HTTP duplicate easy handle with mime data
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/file%TESTNUMBER.txt
 </command>
 <file name="%LOGDIR/file%TESTNUMBER.txt">

diff --git a/tests/data/test655 b/tests/data/test655
index 3f9bc785fbc8c1f8b1b0d125cd6ea18e2e91d564..583e7c0a02790f0631157ab3119085957b5329ef 100644 (file)
--- a/tests/data/test655
+++ b/tests/data/test655
@@ -32,10 +32,10 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 resolver start callback
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test656 b/tests/data/test656
index fff647ca398103fd7445953793af53f1c062db99..9478757d5bcfaeb269b51f11c9f61f60a4c2723f 100644 (file)
--- a/tests/data/test656
+++ b/tests/data/test656
@@ -12,10 +12,10 @@ FAILURE
 <server>
 sftp
 </server>
- <name>
+<name>
 SFTP retrieval with nonexistent private key file
- </name>
- <command>
+</name>
+<command>
 --key DOES_NOT_EXIST --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/not-a-valid-file-moooo --insecure --connect-timeout 8
 </command>
 </client>

diff --git a/tests/data/test658 b/tests/data/test658
index df5be763f9cb9fa17eef347b87ee6c7d4809ef8a..32ca29db49788dd072a0f9ac48aa6c9cd7b15b2e 100644 (file)
--- a/tests/data/test658
+++ b/tests/data/test658
@@ -31,8 +31,8 @@ lib%TESTNUMBER
 </tool>
 <name>
 Pass URL to libcurl with CURLOPT_CURLU
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test659 b/tests/data/test659
index ef7cf12efd2829b6bb89fcc1b739d57658cb9dbe..5cad5eadcd5c34be76592178c42c01aab690a5c6 100644 (file)
--- a/tests/data/test659
+++ b/tests/data/test659
@@ -32,8 +32,8 @@ lib%TESTNUMBER
 </tool>
 <name>
 CURLOPT_CURLU without the path set - over proxy
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT
 </command>
 <features>

diff --git a/tests/data/test66 b/tests/data/test66
index 0e66289bbaf2e007d9162043e77cf320775eaccf..13aa08384fb570f36e5862909c87aa5de1508d69 100644 (file)
--- a/tests/data/test66
+++ b/tests/data/test66
@@ -21,10 +21,10 @@ no headers swsclose
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET without headers in the response
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http0.9
 </command>
 </client>

diff --git a/tests/data/test660 b/tests/data/test660
index b53d47bce83418b1703658ba3819892f5062dbf4..8fdf879d9ad23ad9d76393db4075b6a1e725f74e 100644 (file)
--- a/tests/data/test660
+++ b/tests/data/test660
@@ -14,9 +14,9 @@ imap
 <tool>
 lib597
 </tool>
- <name>
+<name>
 IMAP CONNECT_ONLY option
- </name>
+</name>
 
 <command>
 imap://%HOSTIP:%IMAPPORT/%TESTNUMBER

diff --git a/tests/data/test661 b/tests/data/test661
index ccfdf41ff36ea436c43b55c50c19f4367ea02637..5965bd8aeacb7fc9e0f67d795131c0f748c0d076 100644 (file)
--- a/tests/data/test661
+++ b/tests/data/test661
@@ -22,10 +22,10 @@ ftp
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 Avoid redundant CWDs
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/
 </command>
 </client>

diff --git a/tests/data/test662 b/tests/data/test662
index 5edaf05e7f62a5599268f195af0c7b0ea39b4ceb..a1d501fd2d2cd10e4e28384446f84c85534a387d 100644 (file)
--- a/tests/data/test662
+++ b/tests/data/test662
@@ -46,10 +46,10 @@ body
 <server>
 http
 </server>
- <name>
+<name>
 HTTP redirect with whitespace in absolute Location: URL
- </name>
- <command>
+</name>
+<command>
 http://example.com/please/gimme/%TESTNUMBER -L -x http://%HOSTIP:%HTTPPORT
 </command>
 <features>

diff --git a/tests/data/test663 b/tests/data/test663
index 72692585fdc28ae01affdb4c1e828f9778dae646..313910aa6bc2f530a07f31c61ccbc150d09c465b 100644 (file)
--- a/tests/data/test663
+++ b/tests/data/test663
@@ -50,10 +50,10 @@ body
 <server>
 http
 </server>
- <name>
+<name>
 HTTP redirect with dotdots and whitespaces in absolute Location: URL
- </name>
- <command>
+</name>
+<command>
 http://example.com/please/../gimme/%TESTNUMBER?foobar#hello -L -x http://%HOSTIP:%HTTPPORT
 </command>
 <features>

diff --git a/tests/data/test664 b/tests/data/test664
index 69404ef4f404c146491de0f1030f060a2c4ba327..6ef1d90cbe7c81b0ed81133a892d14dfcd555078 100644 (file)
--- a/tests/data/test664
+++ b/tests/data/test664
@@ -20,10 +20,10 @@ test
 <server>
 sftp
 </server>
- <name>
+<name>
 SFTP correct host key
- </name>
- <command>
+</name>
+<command>
 --hostpubmd5 %SSHSRVMD5 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt
 </command>
 <file name="%LOGDIR/file%TESTNUMBER.txt">

diff --git a/tests/data/test665 b/tests/data/test665
index 07aea62af78d899cf9fd8e20c881d7864c8256f9..bdab82945a9548d388d4925f79777a373afcba87 100644 (file)
--- a/tests/data/test665
+++ b/tests/data/test665
@@ -20,10 +20,10 @@ test
 <server>
 scp
 </server>
- <name>
+<name>
 SCP correct host key
- </name>
- <command>
+</name>
+<command>
 --hostpubmd5 %SSHSRVMD5 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt
 </command>
 <file name="%LOGDIR/file%TESTNUMBER.txt">

diff --git a/tests/data/test666 b/tests/data/test666
index 2ab29160fb3924fc7bb900d0f4b2c8f6e13f42c6..ecb35ec3722127719ac8460844f8a9d3b99f65b1 100644 (file)
--- a/tests/data/test666
+++ b/tests/data/test666
@@ -42,10 +42,10 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 HTTP mime post with binary-encoded huge data contents
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test667 b/tests/data/test667
index 222d3c6fbe9d182f668bd675f0d1c15454b5e69a..d62a81d0fb64c35851a221205848146caae9e5a3 100644 (file)
--- a/tests/data/test667
+++ b/tests/data/test667
@@ -43,10 +43,10 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 HTTP chunked mimepost using single-byte read callback with encoder
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test668 b/tests/data/test668
index 9f5aee34f47493ae7752fe7287ad59b162f1f09c..14905ddc6098f3552241520f83e1e77b6b4e7250 100644 (file)
--- a/tests/data/test668
+++ b/tests/data/test668
@@ -43,10 +43,10 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 HTTP mimepost early end of data detection
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/file%TESTNUMBER.txt
 </command>
 <file name="%LOGDIR/file%TESTNUMBER.txt">

diff --git a/tests/data/test669 b/tests/data/test669
index eaa6ec9bbdd61319271911eba9030dbd096082e4..620aa3393d5dd16e5090a0c696f384da8f578495 100644 (file)
--- a/tests/data/test669
+++ b/tests/data/test669
@@ -27,10 +27,10 @@ Mime
 <server>
 http
 </server>
- <name>
+<name>
 HTTP custom Content-Type with parameter
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -H 'Content-type: multipart/form-data; charset=utf-8' -F name=daniel -F tool=curl
 </command>
 </client>

diff --git a/tests/data/test670 b/tests/data/test670
index 42e18bfc6cc7c155aa366e8b4115a76cf9c3dd1e..94910b5362b78923d4f2c4104126bda7e4ad5907 100644 (file)
--- a/tests/data/test670
+++ b/tests/data/test670
@@ -43,10 +43,10 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 Request pause from mime read callback: multi
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test671 b/tests/data/test671
index c222cee876fc2445699790eebaed48891bcf8b88..e49aacd51ae209e4a83ebb4fa45ff45b14562253 100644 (file)
--- a/tests/data/test671
+++ b/tests/data/test671
@@ -43,10 +43,10 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 Request pause from mime read callback: easy
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test672 b/tests/data/test672
index b105875c02f6e828f32af93965b4309d8878ff2c..387058d891d8a2ced7e4f3d9fe5de32bc5a45848 100644 (file)
--- a/tests/data/test672
+++ b/tests/data/test672
@@ -43,10 +43,10 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 Request pause from form read callback: multi
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test673 b/tests/data/test673
index ba20d0928c26eb2fd2b037227707436d509773a1..5cc3e015a3a9e9bea45d4ccb9a3f390ae3c7444a 100644 (file)
--- a/tests/data/test673
+++ b/tests/data/test673
@@ -43,10 +43,10 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 Request pause from form read callback: easy
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test674 b/tests/data/test674
index 1afe1f695ed98e327669ca97f063fc02759e9da3..2043b3d4ae1122a782f65e93c2db41235d191a82 100644 (file)
--- a/tests/data/test674
+++ b/tests/data/test674
@@ -32,8 +32,8 @@ lib%TESTNUMBER
 </tool>
 <name>
 Set CURLOPT_CURLU and dupe the handle
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test675 b/tests/data/test675
index 0e471eba920c86ddd20e39c54d3e6eb65f97804d..82ae14031f380d1aa46e7a3879c81e671f1fb69b 100644 (file)
--- a/tests/data/test675
+++ b/tests/data/test675
@@ -23,9 +23,9 @@ the content would go here
 <server>
 http
 </server>
- <name>
+<name>
 HTTP connection reuse and different credentials
- </name>
+</name>
 
 <command>
 http://user1:foo1@%HOSTIP:%HTTPPORT/user1/%TESTNUMBER http://user2:foo2@%HOSTIP:%HTTPPORT/user2/%TESTNUMBER

diff --git a/tests/data/test676 b/tests/data/test676
index 601184fe95d622caaa94ef6b11ad08074782fd4a..031395eb8e295d271b95f5742870ce05bf626054 100644 (file)
--- a/tests/data/test676
+++ b/tests/data/test676
@@ -55,10 +55,10 @@ http
 lib%TESTNUMBER
 </tool>
 
- <name>
+<name>
 verify setting CURLOPT_COOKIEFILE to NULL again
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER %LOGDIR/cookies676
 </command>
 <features>

diff --git a/tests/data/test677 b/tests/data/test677
index e3d9041fdf48be147a58c784920b97a7817e71d9..166be89543fedbd031cd0bd0f57329dba728a35e 100644 (file)
--- a/tests/data/test677
+++ b/tests/data/test677
@@ -19,9 +19,9 @@ CONNECT_ONLY
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP with CONNECT_ONLY, custom command then exit
- </name>
+</name>
 <tool>
 lib%TESTNUMBER
 </tool>

diff --git a/tests/data/test678 b/tests/data/test678
index 69ae232b31d72067e853b86c9bba5ea2d46bc6d9..42bc70eac5bef61ed1200ec743d21a97c1a766d7 100644 (file)
--- a/tests/data/test678
+++ b/tests/data/test678
@@ -29,9 +29,9 @@ SSL
 <server>
 https Server-localhost-sv.pem
 </server>
- <name>
+<name>
 HTTPS GET using CURLOPT_CAINFO_BLOB
- </name>
+</name>
 <tool>
 lib%TESTNUMBER
 </tool>

diff --git a/tests/data/test679 b/tests/data/test679
index d435ae0dbbe52ba7fdbc3ff2915ac175c4596d54..1ad174704c0effce38ee0790831a4f1433b26be5 100644 (file)
--- a/tests/data/test679
+++ b/tests/data/test679
@@ -30,10 +30,10 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 netrc with quoted password
- </name>
- <command>
+</name>
+<command>
 --netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER http://%HOSTIP:%HTTPPORT/
 </command>
 <file name="%LOGDIR/netrc%TESTNUMBER" >

diff --git a/tests/data/test680 b/tests/data/test680
index 2cd0d47fe03ec2eacbec586b9a3f9e7785ecf7be..5ea3eaa64632b3072743d24781ba5cade6577924 100644 (file)
--- a/tests/data/test680
+++ b/tests/data/test680
@@ -19,10 +19,10 @@ none
 <features>
 http
 </features>
- <name>
+<name>
 netrc with quoted password but missing end quote
- </name>
- <command>
+</name>
+<command>
 --netrc --netrc-file %LOGDIR/netrc%TESTNUMBER http://user1@http.example/
 </command>
 <file name="%LOGDIR/netrc%TESTNUMBER" >

diff --git a/tests/data/test682 b/tests/data/test682
index 0e3a789e652a6d6788c603b92788483e173ed535..fc2189918525269ae8eeca61621d0775378c1334 100644 (file)
--- a/tests/data/test682
+++ b/tests/data/test682
@@ -26,10 +26,10 @@ Connection: close
 <server>
 http
 </server>
- <name>
+<name>
 netrc with multiple logins - pick first
- </name>
- <command>
+</name>
+<command>
 --netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER http://user1@%HOSTIP:%HTTPPORT/
 </command>
 <file name="%LOGDIR/netrc%TESTNUMBER" >

diff --git a/tests/data/test683 b/tests/data/test683
index 4cbf5f077d38280dfe388852e21a7cd684cc8045..9eb250fbd7c182c53c3c7095975c9defeb951af6 100644 (file)
--- a/tests/data/test683
+++ b/tests/data/test683
@@ -26,10 +26,10 @@ Connection: close
 <server>
 http
 </server>
- <name>
+<name>
 netrc with multiple logins - pick second
- </name>
- <command>
+</name>
+<command>
 --netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER http://user2@%HOSTIP:%HTTPPORT/
 </command>
 <file name="%LOGDIR/netrc%TESTNUMBER" >

diff --git a/tests/data/test684 b/tests/data/test684
index 712ee3be0744fb56c55d922e8f578144b6280480..a63424e2509cb55783961328df6fd9a843884cee 100644 (file)
--- a/tests/data/test684
+++ b/tests/data/test684
@@ -26,10 +26,10 @@ Connection: close
 <server>
 http
 </server>
- <name>
+<name>
 netrc with no login
- </name>
- <command>
+</name>
+<command>
 --netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER http://%HOSTIP:%HTTPPORT/
 </command>
 <file name="%LOGDIR/netrc%TESTNUMBER" >

diff --git a/tests/data/test685 b/tests/data/test685
index 9d64fe788461fa3a950e298ebeb62b385436c3e2..bdb2124b4b002506527fb5e65ba9bc53d0a16ae0 100644 (file)
--- a/tests/data/test685
+++ b/tests/data/test685
@@ -26,10 +26,10 @@ Connection: close
 <server>
 http
 </server>
- <name>
+<name>
 netrc with no login - provided user
- </name>
- <command>
+</name>
+<command>
 --netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER http://user@%HOSTIP:%HTTPPORT/
 </command>
 <file name="%LOGDIR/netrc%TESTNUMBER" >

diff --git a/tests/data/test686 b/tests/data/test686
index 0badad06232a1709acc5d40b23c0cf89b00b50f8..6189d7a174c4a0126ffd5c5b883486147d39a8e2 100644 (file)
--- a/tests/data/test686
+++ b/tests/data/test686
@@ -16,10 +16,10 @@ errorcode
 <server>
 none
 </server>
- <name>
+<name>
 verify return code for missing URL after --next
- </name>
- <command>
+</name>
+<command>
 htdhdhdtp://localhost --next
 </command>
 </client>

diff --git a/tests/data/test7 b/tests/data/test7
index b7487ffb705b95ebdd1cc24a52b745ea287e6ca3..e98d5f5b1b591a5ee3a9d92053f1cee98b2f548a 100644 (file)
--- a/tests/data/test7
+++ b/tests/data/test7
@@ -28,10 +28,10 @@ Set-Cookie: partmatch=present; domain=.0.0.1; path=/;
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with cookie parser and header recording
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b none -D %LOGDIR/heads%TESTNUMBER.txt
 </command>
 </client>

diff --git a/tests/data/test70 b/tests/data/test70
index 622b9a9c52dc8cc9325f669d944ad489482ebcda..69cba7da47f72336af0fb2b256b00ef0e041b22d 100644 (file)
--- a/tests/data/test70
+++ b/tests/data/test70
@@ -58,10 +58,10 @@ NTLM
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with Digest *OR* NTLM authorization
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth
 </command>
 </client>

diff --git a/tests/data/test700 b/tests/data/test700
index e2a0d3320d7a4a0e038c738d3ca17ad4432f39b6..fb59098354c05acaf150cf4b42d7ab68d008e0d1 100644 (file)
--- a/tests/data/test700
+++ b/tests/data/test700
@@ -36,10 +36,10 @@ proxy
 http
 socks4
 </server>
- <name>
+<name>
 HTTP GET via SOCKS4 proxy
- </name>
- <command>
+</name>
+<command>
 --socks4 %HOSTIP:%SOCKSPORT http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test701 b/tests/data/test701
index f4cd7f14b3494a251805ea302cb41e2da4f64ec7..b7a9091a98d92d9b756e2e2ec8066be4de4fed1c 100644 (file)
--- a/tests/data/test701
+++ b/tests/data/test701
@@ -36,10 +36,10 @@ proxy
 http
 socks5
 </server>
- <name>
+<name>
 HTTP GET via SOCKS5 proxy
- </name>
- <command>
+</name>
+<command>
 --socks5 %HOSTIP:%SOCKSPORT http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test702 b/tests/data/test702
index 4e06f88890c42350cfc664590c69f0da0f4ef8bb..559636d36fa443b25e309550e6af60ace69b9ddb 100644 (file)
--- a/tests/data/test702
+++ b/tests/data/test702
@@ -30,10 +30,10 @@ socks4
 http
 proxy
 </features>
- <name>
+<name>
 Attempt connect to non-listening HTTP server via SOCKS4 proxy
- </name>
- <command>
+</name>
+<command>
 --socks4 %HOSTIP:%SOCKSPORT http://%HOSTIP:%NOLISTENPORT
 </command>
 </client>

diff --git a/tests/data/test703 b/tests/data/test703
index 3c3487aeecb49ca9f3a89d313ee208c91ea44576..67bf998760e15603e0f027740c80e36cc8ebcde4 100644 (file)
--- a/tests/data/test703
+++ b/tests/data/test703
@@ -27,10 +27,10 @@ socks5
 http
 proxy
 </features>
- <name>
+<name>
 Attempt connect to non-listening HTTP server via SOCKS5 proxy
- </name>
- <command>
+</name>
+<command>
 --socks5 %HOSTIP:%SOCKSPORT http://%HOSTIP:%NOLISTENPORT
 </command>
 </client>

diff --git a/tests/data/test704 b/tests/data/test704
index b9abc45e1212a7302f5cb1533910e4a50408a713..67bee39c16fb7ee00adcb45c9e6c9e3ab9c88eb2 100644 (file)
--- a/tests/data/test704
+++ b/tests/data/test704
@@ -19,10 +19,10 @@ FAILURE
 <server>
 http
 </server>
- <name>
+<name>
 Attempt connect to non-listening SOCKS4 proxy
- </name>
- <command>
+</name>
+<command>
 --socks4 %HOSTIP:%NOLISTENPORT http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 <features>

diff --git a/tests/data/test705 b/tests/data/test705
index 5d3692dc4057782e25528652395389746f930a1e..ed23bafe71cd5db325c9bfea8b8b9c6f62ab80d3 100644 (file)
--- a/tests/data/test705
+++ b/tests/data/test705
@@ -19,10 +19,10 @@ FAILURE
 <server>
 http
 </server>
- <name>
+<name>
 Attempt connect to non-listening SOCKS5 proxy
- </name>
- <command>
+</name>
+<command>
 --socks5 %HOSTIP:%NOLISTENPORT http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 <features>

diff --git a/tests/data/test706 b/tests/data/test706
index 873f129892b1653e29f2b93e10b9231f438e0b0d..656b3dd8b7bca093bda61d50ffb6e6753327c100 100644 (file)
--- a/tests/data/test706
+++ b/tests/data/test706
@@ -38,10 +38,10 @@ proxy
 ftp
 socks4
 </server>
- <name>
+<name>
 FTP dir list PASV via SOCKS4
- </name>
- <command>
+</name>
+<command>
 --socks4 %HOSTIP:%SOCKSPORT ftp://%HOSTIP:%FTPPORT/
 </command>
 </client>

diff --git a/tests/data/test707 b/tests/data/test707
index e58919345345e2488115fbdc6271b4cc8d5d2822..3ed89ec627349a9ae699fb7d850daced48a80c23 100644 (file)
--- a/tests/data/test707
+++ b/tests/data/test707
@@ -38,10 +38,10 @@ proxy
 ftp
 socks5
 </server>
- <name>
+<name>
 FTP dir list PASV via SOCKS5
- </name>
- <command>
+</name>
+<command>
 --socks5 %HOSTIP:%SOCKSPORT ftp://%HOSTIP:%FTPPORT/
 </command>
 </client>

diff --git a/tests/data/test708 b/tests/data/test708
index 72f4dcec8e8ff27fccdcdbdb788629e20627a1c0..d6797dc65f3a3bf43b669cff86f6619bf43485d8 100644 (file)
--- a/tests/data/test708
+++ b/tests/data/test708
@@ -39,10 +39,10 @@ socks4
 <setenv>
 all_proxy=socks4://%HOSTIP:%SOCKSPORT
 </setenv>
- <name>
+<name>
 HTTP GET via SOCKS4 proxy
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test709 b/tests/data/test709
index d6380aff2b36bb9856fdd5ac00a68f230360c649..656675395c7fda425a8d40843be24e0bec91ef5c 100644 (file)
--- a/tests/data/test709
+++ b/tests/data/test709
@@ -39,10 +39,10 @@ socks5
 <setenv>
 http_proxy=socks5://%HOSTIP:%SOCKSPORT
 </setenv>
- <name>
+<name>
 HTTP GET via SOCKS5 set in http_proxy environment variable
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test71 b/tests/data/test71
index 2b8c3cab473b47fe2a7433786fd70487d4dae875..f47879a3f7384b9f464a11474275034a1400a368 100644 (file)
--- a/tests/data/test71
+++ b/tests/data/test71
@@ -27,16 +27,16 @@ Mime
 <server>
 http
 </server>
- <name>
+<name>
 HTTP and -F upload in config file
- </name>
+</name>
 <stdin>
 -F name=daniel
 -F tool=curl
 -F file=@%LOGDIR/test%TESTNUMBER.txt
 user-agent = ""
 </stdin>
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -K -
 </command>
 # We create this file before the command is invoked!

diff --git a/tests/data/test710 b/tests/data/test710
index 20a1af053304f9487dba60e66bc84377b7f2e10c..02033831b68b78d7cc87d2b588b57dac2397aae3 100644 (file)
--- a/tests/data/test710
+++ b/tests/data/test710
@@ -36,10 +36,10 @@ proxy
 http
 socks5
 </server>
- <name>
+<name>
 HTTP GET via SOCKS5 set with --proxy
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy socks5://%HOSTIP:%SOCKSPORT
 </command>
 </client>

diff --git a/tests/data/test711 b/tests/data/test711
index e5f1c39fd6fe9b4b889849c1286405e48c5e1ced..355ca0e51efeafec5026dae17de3c2f7e908e858 100644 (file)
--- a/tests/data/test711
+++ b/tests/data/test711
@@ -32,10 +32,10 @@ socks5
 <setenv>
 all_proxy=socks5://%HOSTIP:%SOCKSPORT
 </setenv>
- <name>
+<name>
 FTP fetch with all_proxy set to socks5
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test712 b/tests/data/test712
index 76859f4531f33231c113929d94a8890d57fbc88b..7bcc2a1bbb40e7fba92a35eb4ed882e44f2db12d 100644 (file)
--- a/tests/data/test712
+++ b/tests/data/test712
@@ -26,10 +26,10 @@ proxy
 ftp
 socks5
 </server>
- <name>
+<name>
 FTP fetch with --proxy set to socks5://
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --proxy socks5://%HOSTIP:%SOCKSPORT
 </command>
 </client>

diff --git a/tests/data/test713 b/tests/data/test713
index 73fd5e956a956fee346614e31ac929b2af595b97..44820a78ffc762c79067395cdad7353f0e3cea9a 100644 (file)
--- a/tests/data/test713
+++ b/tests/data/test713
@@ -27,10 +27,10 @@ proxy
 ftp
 socks5
 </server>
- <name>
+<name>
 FTP fetch with --proxy set to socks5:// and with --connect-to
- </name>
- <command>
+</name>
+<command>
 ftp://ftp.example.com/%TESTNUMBER --connect-to ::%HOSTIP:%FTPPORT --proxy socks5://%HOSTIP:%SOCKSPORT
 </command>
 </client>

diff --git a/tests/data/test714 b/tests/data/test714
index 82e1449f083a1e0cb3b1cc29755bc7a5cda262dc..a38400bb809805a208b66144611a3902adc9de74 100644 (file)
--- a/tests/data/test714
+++ b/tests/data/test714
@@ -46,10 +46,10 @@ http-proxy
 http
 proxy
 </features>
- <name>
+<name>
 FTP fetch with --proxy set to http:// and with --connect-to
- </name>
- <command>
+</name>
+<command>
 ftp://ftp.example.com.%TESTNUMBER/%TESTNUMBER --connect-to ::connect.example.com.%TESTNUMBER:%FTPPORT --proxytunnel --proxy http://%HOSTIP:%PROXYPORT
 </command>
 </client>

diff --git a/tests/data/test715 b/tests/data/test715
index 5c62273888d9e65bc71fa5d381b29ca4a18809cd..6f9670af54d7e9e5638214c13dc281fdbc73d030 100644 (file)
--- a/tests/data/test715
+++ b/tests/data/test715
@@ -48,10 +48,10 @@ socks5
 http
 proxy
 </features>
- <name>
+<name>
 FTP fetch with --preproxy, --proxy and --connect-to
- </name>
- <command>
+</name>
+<command>
 ftp://ftp.example.com.%TESTNUMBER/%TESTNUMBER --connect-to ::connect.example.com.%TESTNUMBER:%FTPPORT --proxytunnel --proxy %HOSTIP:%PROXYPORT --preproxy socks5://%HOSTIP:%SOCKSPORT
 </command>
 </client>

diff --git a/tests/data/test716 b/tests/data/test716
index 4de1cd95fd3690cff5725733eb40dce2ba1975ea..5c20b45a75f61bf1049f35aea3f59e5ece3ffec5 100644 (file)
--- a/tests/data/test716
+++ b/tests/data/test716
@@ -30,7 +30,7 @@ SOCKS5 proxy with too long user name
 </name>
 
 # it should never connect to the target server
- <command>
+<command>
 http://hohoho.example.com:99/%TESTNUMBER -x socks5://AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA:b@%HOSTIP:%SOCKSPORT
 </command>
 </client>

diff --git a/tests/data/test717 b/tests/data/test717
index bbbc9ed3fcd707e9edd9448e5061102117b8bc56..54ab95568028aab764e98f8146826129c8e958b7 100644 (file)
--- a/tests/data/test717
+++ b/tests/data/test717
@@ -44,7 +44,7 @@ SOCKS5 proxy auth
 </name>
 
 # target a port that won't work without the SOCKS magic
- <command>
+<command>
 http://%HOSTIP:1/%TESTNUMBER -x socks5://uz3r:p4ssworm@%HOSTIP:%SOCKSPORT
 </command>
 <features>

diff --git a/tests/data/test718 b/tests/data/test718
index 613647aa0e7ee43fd442e0e9e7eb88894df1e528..dcbf7d77a15cf54618f82abe9ae3214974fc0cf7 100644 (file)
--- a/tests/data/test718
+++ b/tests/data/test718
@@ -37,10 +37,10 @@ http
 crypto
 proxy
 </features>
- <name>
+<name>
 HTTP proxy CONNECT (no auth) with proxy returning 407 and closing
- </name>
- <command>
+</name>
+<command>
 http://test.remote.haxx.se.%TESTNUMBER:8990/path/%TESTNUMBER0002 --proxy http://%HOSTIP:%HTTPPORT --proxytunnel
 </command>
 </client>

diff --git a/tests/data/test719 b/tests/data/test719
index d42f051b5e14f30db51a3790c3d84aa95d66aeab..63cb888863240bc94e37f5fefbccb0dc86686317 100644 (file)
--- a/tests/data/test719
+++ b/tests/data/test719
@@ -38,10 +38,10 @@ proxy
 http
 socks5
 </server>
- <name>
+<name>
 HTTP GET with IPv6 numerical via SOCKS5h
- </name>
- <command>
+</name>
+<command>
 http://[2200::33]:%HTTPPORT/%TESTNUMBER --proxy socks5h://%HOSTIP:%SOCKSPORT
 </command>
 </client>

diff --git a/tests/data/test72 b/tests/data/test72
index 00c4c6421a345dcb1c6cef8a6c9267ca90526c53..176d0dff8e7577ee2b0483a0ee8795916b7f718d 100644 (file)
--- a/tests/data/test72
+++ b/tests/data/test72
@@ -57,10 +57,10 @@ http
 !SSPI
 crypto
 </features>
- <name>
+<name>
 HTTP with Digest *OR* Basic authorization
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth
 </command>
 </client>

diff --git a/tests/data/test720 b/tests/data/test720
index ffdee1d691edc96a63a7199c1ab05e214289bdef..709656a280632521126b1a235fe6a0c2dc64c25f 100644 (file)
--- a/tests/data/test720
+++ b/tests/data/test720
@@ -37,10 +37,10 @@ proxy
 http
 socks5
 </server>
- <name>
+<name>
 HTTP GET with IPv4 numerical via SOCKS5h
- </name>
- <command>
+</name>
+<command>
 http://12.34.56.78:%HTTPPORT/%TESTNUMBER --proxy socks5h://%HOSTIP:%SOCKSPORT
 </command>
 </client>

diff --git a/tests/data/test721 b/tests/data/test721
index 3092eaac6926a1ba9e52ba954d624967cbf63480..db63a8f6b523321379ca837d372bae67d369ec0f 100644 (file)
--- a/tests/data/test721
+++ b/tests/data/test721
@@ -37,10 +37,10 @@ proxy
 http
 socks5
 </server>
- <name>
+<name>
 HTTP GET with host name using SOCKS5h
- </name>
- <command>
+</name>
+<command>
 http://this.is.a.host.name:%HTTPPORT/%TESTNUMBER --proxy socks5h://%HOSTIP:%SOCKSPORT
 </command>
 </client>

diff --git a/tests/data/test722 b/tests/data/test722
index 25fdbe161259140707a0677e0b07ba3efcc3c7d9..674efd14a294345221a545758c95267cf7f8bce1 100644 (file)
--- a/tests/data/test722
+++ b/tests/data/test722
@@ -30,10 +30,10 @@ Hello curl from IPFS
 <server>
 http
 </server>
- <name>
+<name>
 IPFS
- </name>
- <command>
+</name>
+<command>
 --ipfs-gateway http://%HOSTIP:%HTTPPORT/%TESTNUMBER ipfs://QmV5JejrpgUxnkZeFZYMxVCqAbKy3KdPXWXyuEDiMNZwUx
 </command>
 </client>

diff --git a/tests/data/test723 b/tests/data/test723
index b69e435e4695fe1308d9414c7ed66b69431eac16..aaf4d27a3ac888a70b5d71dafecc1763d4489e29 100644 (file)
--- a/tests/data/test723
+++ b/tests/data/test723
@@ -16,10 +16,10 @@ IPFS
 <server>
 http
 </server>
- <name>
+<name>
 IPFS with malformed gateway URL (bad function argument error)
- </name>
- <command>
+</name>
+<command>
 --ipfs-gateway http://nonexisting,local:8080/%TESTNUMBER ipfs://QmV5JejrpgUxnkZeFZYMxVCqAbKy3KdPXWXyuEDiMNZwUx
 </command>
 </client>

diff --git a/tests/data/test724 b/tests/data/test724
index fa45c6d41dbe91fc4c685ed7a4ed3c62f54d64f7..692046b31e0d7f68bae6ad0efde272101a8f4a0e 100644 (file)
--- a/tests/data/test724
+++ b/tests/data/test724
@@ -33,10 +33,10 @@ http
 <setenv>
 HOME=%PWD/%LOGDIR
 </setenv>
- <name>
+<name>
 IPFS with gateway URL from gateway file
- </name>
- <command>
+</name>
+<command>
 ipfs://QmV5JejrpgUxnkZeFZYMxVCqAbKy3KdPXWXyuEDiMNZwUx
 </command>
 <file name="%LOGDIR/.ipfs/gateway" >

diff --git a/tests/data/test725 b/tests/data/test725
index 3690f1f4114cea2f51345f90a7be293dadaec076..cf3c19664f0944102fadd0c395a90adca01fd89d 100644 (file)
--- a/tests/data/test725
+++ b/tests/data/test725
@@ -19,10 +19,10 @@ http
 <setenv>
 HOME=%PWD/%LOGDIR
 </setenv>
- <name>
+<name>
 IPFS with malformed gateway URL from gateway file
- </name>
- <command>
+</name>
+<command>
 ipfs://QmV5JejrpgUxnkZeFZYMxVCqAbKy3KdPXWXyuEDiMNZwUx
 </command>
 <file name="%LOGDIR/.ipfs/gateway" >

diff --git a/tests/data/test726 b/tests/data/test726
index 5e41d730a7a70389d25b6d1fa98e50359f7698dc..c0abbf29c1a3a2f65f2e365c83e75b302c35defa 100644 (file)
--- a/tests/data/test726
+++ b/tests/data/test726
@@ -22,10 +22,10 @@ http
 # This is to prevent the automatic gateway detection from finding a gateway file in your home folder.
 HOME=%PWD
 </setenv>
- <name>
+<name>
 IPFS with no gateway URL (no environment or home file either)
- </name>
- <command>
+</name>
+<command>
 ipfs://QmV5JejrpgUxnkZeFZYMxVCqAbKy3KdPXWXyuEDiMNZwUx
 </command>
 </client>

diff --git a/tests/data/test727 b/tests/data/test727
index ee7f271b4edc74bf294392b7877fa4adb500226d..e71ef5f446b96bd19c71c0841af998129caf7a26 100644 (file)
--- a/tests/data/test727
+++ b/tests/data/test727
@@ -30,10 +30,10 @@ Hello curl from IPNS
 <server>
 http
 </server>
- <name>
+<name>
 IPNS
- </name>
- <command>
+</name>
+<command>
 --ipfs-gateway http://%HOSTIP:%HTTPPORT/%TESTNUMBER ipns://QmV5JejrpgUxnkZeFZYMxVCqAbKy3KdPXWXyuEDiMNZwUx
 </command>
 </client>

diff --git a/tests/data/test73 b/tests/data/test73
index c5c2c009a07cbbf60443de0502ce568ecc46f3ff..1edcbdcb90171526fb20d0b8c6cc27a9fde36d02 100644 (file)
--- a/tests/data/test73
+++ b/tests/data/test73
@@ -25,10 +25,10 @@ boo
 <server>
 http
 </server>
- <name>
+<name>
 HTTP, receive cookies when using custom Host:, domain using only two dots
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -c %LOGDIR/jar%TESTNUMBER.txt -H "Host: host.NOT_DISCLOSED.se"
 </command>
 <features>

diff --git a/tests/data/test74 b/tests/data/test74
index a2ecdd98bbea7959e05f671bdac9686b4ace7af6..d9316f0e67910549ae86a28a5722632481059da6 100644 (file)
--- a/tests/data/test74
+++ b/tests/data/test74
@@ -39,9 +39,9 @@ crap data
 <server>
 http
 </server>
- <name>
+<name>
 HTTP, urlglob {}-retrieval and -o #[num] usage
- </name>
+</name>
  <command option="no-output">
 "http://%HOSTIP:%HTTPPORT/{%TESTNUMBER,%TESTNUMBER0001}" -o "%LOGDIR/dumpit#1.dump"
 </command>

diff --git a/tests/data/test75 b/tests/data/test75
index b11295c99121294f51a79a26f23f2fea037d9918..dc8b49979fe3af2091a80b5149aa7d94dd37e6a5 100644 (file)
--- a/tests/data/test75
+++ b/tests/data/test75
@@ -21,9 +21,9 @@ none
 <features>
 http
 </features>
- <name>
+<name>
 HTTP, urlglob retrieval with bad range
- </name>
+</name>
  <command option="no-output">
 "http://a-site-never-accessed.example.org/[2-1]" -o "%LOGDIR/weee#1.dump" --stderr -
 </command>

diff --git a/tests/data/test76 b/tests/data/test76
index 8aae75aecb7bf4269fed5456c216d06592d9455d..4c83566dd28c32fb5c882ff01f23e807fbf5db38 100644 (file)
--- a/tests/data/test76
+++ b/tests/data/test76
@@ -18,9 +18,9 @@ none
 <features>
 http
 </features>
- <name>
+<name>
 HTTP, -O with no file name part in the URL
- </name>
+</name>
  <command option="no-output">
 http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER/ -O
 </command>

diff --git a/tests/data/test77 b/tests/data/test77
index d7cce4035d18e9cf48c8c2dd06eb82a8c5a21326..baa9bfc3607447d8a38352f641e1a54d3c71a81a 100644 (file)
--- a/tests/data/test77
+++ b/tests/data/test77
@@ -31,10 +31,10 @@ Content-Type: text/html
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with -z "older date"
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 12:00:00 1999 GMT"
 </command>
 </client>

diff --git a/tests/data/test78 b/tests/data/test78
index 60c4029b7fb3fd9c190585278c57a373daa6d9d1..d52fb15548007c4907a551acf9e8bdeed4656e5d 100644 (file)
--- a/tests/data/test78
+++ b/tests/data/test78
@@ -43,10 +43,10 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with -z "newer date"
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 11:00:00 1999 GMT"
 </command>
 </client>

diff --git a/tests/data/test79 b/tests/data/test79
index 88e9b78e4c469a2a5120887a05625c5242d24ea5..e836b3bf5c3cdeb5a7ade482fe4c6248859970e5 100644 (file)
--- a/tests/data/test79
+++ b/tests/data/test79
@@ -31,10 +31,10 @@ http
 ftp
 proxy
 </features>
- <name>
+<name>
 FTP over HTTP proxy
- </name>
- <command>
+</name>
+<command>
 ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT
 </command>
 </client>

diff --git a/tests/data/test799 b/tests/data/test799
index 9849512608fe8d55a54bcf25900837bcfcc181e8..e8563a598fe4afb78bf08838c8b7f6afe9cb5c5c 100644 (file)
--- a/tests/data/test799
+++ b/tests/data/test799
@@ -31,10 +31,10 @@ body
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP with --login-options 'AUTH=+LOGIN'
- </name>
- <command>
+</name>
+<command>
 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret --login-options AUTH=+LOGIN
 </command>
 </client>

diff --git a/tests/data/test8 b/tests/data/test8
index 7d087f337de4592c941f6be5fa9d5aaa1009357e..9e58188151a1c97b02ef59a646047650617a0ff4 100644 (file)
--- a/tests/data/test8
+++ b/tests/data/test8
@@ -21,10 +21,10 @@ Server: test-server/fake
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with cookie parsing from header file
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b %LOGDIR/heads%TESTNUMBER.txt
 </command>
 

diff --git a/tests/data/test80 b/tests/data/test80
index ef62f5228b8888376ce1578ee4152c90d832f4a4..21d9fd2ea5f6c13a98503860b5f2a642a127648b 100644 (file)
--- a/tests/data/test80
+++ b/tests/data/test80
@@ -49,10 +49,10 @@ contents
 http
 http-proxy
 </server>
- <name>
+<name>
 HTTP 1.0 CONNECT with proxytunnel and proxy+host Basic authentication
- </name>
- <command>
+</name>
+<command>
 http://test.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER -p --proxy1.0 %HOSTIP:%PROXYPORT --user iam:myself --proxy-user youare:yourself
 </command>
 <features>

diff --git a/tests/data/test800 b/tests/data/test800
index 9f961ebc9828d85a69bc5871c5dc0e717b3ea59e..a2daf240a7000fb48272ceeeac42524e0f5c8d16 100644 (file)
--- a/tests/data/test800
+++ b/tests/data/test800
@@ -27,10 +27,10 @@ body
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP FETCH message
- </name>
- <command>
+</name>
+<command>
 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u '"user:sec"ret{'
 </command>
 </client>

diff --git a/tests/data/test801 b/tests/data/test801
index dcfa18cf6356ad779367447e1bd3ca98f1d98620..9b68d62a86a7564fc34e0a35928313aedc66f6a6 100644 (file)
--- a/tests/data/test801
+++ b/tests/data/test801
@@ -24,10 +24,10 @@ body
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP FETCH message by MAILINDEX and SECTION
- </name>
- <command>
+</name>
+<command>
 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=123/;SECTION=1' -u user:secret
 </command>
 </client>

diff --git a/tests/data/test802 b/tests/data/test802
index 76ede9e9da95cd15cf268dd1cd70ee146df809ed..1e2e35bfa01b5837060a4c813e8819dd58dc97f5 100644 (file)
--- a/tests/data/test802
+++ b/tests/data/test802
@@ -25,10 +25,10 @@ body
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP SELECT UIDVALIDITY Success
- </name>
- <command>
+</name>
+<command>
 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER;UIDVALIDITY=3857529045/;MAILINDEX=123/;SECTION=TEXT' -u user:secret
 </command>
 </client>

diff --git a/tests/data/test803 b/tests/data/test803
index f16a419aa2b8eceb7c83dd8c42a9c59b2be56899..6fb00eb0a6a73dfabbb38ab6ee5782b16a5f55db 100644 (file)
--- a/tests/data/test803
+++ b/tests/data/test803
@@ -20,10 +20,10 @@ FAILURE
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP SELECT UIDVALIDITY Failure
- </name>
- <command>
+</name>
+<command>
 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER;UIDVALIDITY=12345/;MAILINDEX=123' -u user:secret
 </command>
 </client>

diff --git a/tests/data/test804 b/tests/data/test804
index 1626cf88c64fc6f5bc385d8ef6185e8f34451cfe..420dfb70c68767f5d76678dc60cca055674209cf 100644 (file)
--- a/tests/data/test804
+++ b/tests/data/test804
@@ -24,10 +24,10 @@ body
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP doesn't perform SELECT if re-using the same mailbox
- </name>
- <command>
+</name>
+<command>
 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=123/;SECTION=1' 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=456/;SECTION=2.3' -u user:secret
 </command>
 </client>

diff --git a/tests/data/test805 b/tests/data/test805
index 07fb97cfa5cb612bc4b18a6da3963474173754fa..7370e63604b9decef65752f34898d3fa1c0d4b02 100644 (file)
--- a/tests/data/test805
+++ b/tests/data/test805
@@ -19,10 +19,10 @@ UPLOAD
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP APPEND message
- </name>
- <command>
+</name>
+<command>
 imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -u user:secret
 </command>
 <file name="%LOGDIR/upload%TESTNUMBER">

diff --git a/tests/data/test806 b/tests/data/test806
index 128ad85bc2863ea077790fca56df0ce29a32b72c..adfbc11212cf9988e4bb122b9d570b0c9c34202c 100644 (file)
--- a/tests/data/test806
+++ b/tests/data/test806
@@ -23,10 +23,10 @@ LIST
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP LIST mailbox
- </name>
- <command>
+</name>
+<command>
 imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -u user:secret
 </command>
 </client>

diff --git a/tests/data/test807 b/tests/data/test807
index 59c12eb288bd247f9b24e5572f8e313e122a5de9..80a1044da0f4c302c4fdb9d99f7b442211434b44 100644 (file)
--- a/tests/data/test807
+++ b/tests/data/test807
@@ -24,10 +24,10 @@ CUSTOMREQUEST
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP LSUB mailbox
- </name>
- <command>
+</name>
+<command>
 imap://%HOSTIP:%IMAPPORT -u user:secret -X 'LSUB "%TESTNUMBER" *'
 </command>
 </client>

diff --git a/tests/data/test808 b/tests/data/test808
index a77589a7cc57b0e2385b8a1983303e00dcfe3b04..542f87e6d6abdd192a7ba8a2c5344e8fcd246def 100644 (file)
--- a/tests/data/test808
+++ b/tests/data/test808
@@ -28,10 +28,10 @@ CUSTOMREQUEST
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP EXAMINE mailbox (CUSTOMREQUEST)
- </name>
- <command>
+</name>
+<command>
 imap://%HOSTIP:%IMAPPORT -u user:secret -X 'EXAMINE %TESTNUMBER'
 </command>
 </client>

diff --git a/tests/data/test809 b/tests/data/test809
index 8122eaf698d036f610614651a905f646b80dcee6..25635d21f04fe35594e2bdcc72e99e26631be03e 100644 (file)
--- a/tests/data/test809
+++ b/tests/data/test809
@@ -22,10 +22,10 @@ CUSTOMREQUEST
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP mailbox STATUS (CUSTOMREQUEST)
- </name>
- <command>
+</name>
+<command>
 imap://%HOSTIP:%IMAPPORT -u user:secret -X 'STATUS %TESTNUMBER (UIDNEXT MESSAGES)'
 </command>
 </client>

diff --git a/tests/data/test810 b/tests/data/test810
index 80aac560e15eafce801c1efab051e797afc80e24..37d76f6ba0bc15734d35bdb6051fd433d8e797f9 100644 (file)
--- a/tests/data/test810
+++ b/tests/data/test810
@@ -21,10 +21,10 @@ SEARCH
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP SEARCH for NEW messages
- </name>
- <command>
+</name>
+<command>
 imap://%HOSTIP:%IMAPPORT/%TESTNUMBER?NEW -u user:secret
 </command>
 </client>

diff --git a/tests/data/test811 b/tests/data/test811
index f0938be118079c406928d62529e3238a7442ce60..e2520c3319642e75c398c94ab75df76ccfde566f 100644 (file)
--- a/tests/data/test811
+++ b/tests/data/test811
@@ -19,10 +19,10 @@ CUSTOMREQUEST
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP CREATE mailbox (CUSTOMREQUEST)
- </name>
- <command>
+</name>
+<command>
 imap://%HOSTIP:%IMAPPORT -u user:secret -X 'CREATE %TESTNUMBER'
 </command>
 </client>

diff --git a/tests/data/test812 b/tests/data/test812
index 8374ea093646801610b04ea2bedaa262442a5516..0180e023e8d005453c6c39be8cd8f35ac4e5f6b8 100644 (file)
--- a/tests/data/test812
+++ b/tests/data/test812
@@ -19,10 +19,10 @@ CUSTOMREQUEST
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP DELETE mailbox (CUSTOMREQUEST)
- </name>
- <command>
+</name>
+<command>
 imap://%HOSTIP:%IMAPPORT -u user:secret -X 'DELETE %TESTNUMBER'
 </command>
 </client>

diff --git a/tests/data/test813 b/tests/data/test813
index 2e8c42d0cfc3627e1e169a56e7e8d7d8f1814ada..674d308fd7e9ad2642c81d5736ba577fa857c220 100644 (file)
--- a/tests/data/test813
+++ b/tests/data/test813
@@ -19,10 +19,10 @@ CUSTOMREQUEST
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP RENAME mailbox (CUSTOMREQUEST)
- </name>
- <command>
+</name>
+<command>
 imap://%HOSTIP:%IMAPPORT -u user:secret -X 'RENAME 666 %TESTNUMBER'
 </command>
 </client>

diff --git a/tests/data/test814 b/tests/data/test814
index c673c43558a04a09dc79e2bef60399b942661831..e73b0e894a32a0d92501baee38386db317945852 100644 (file)
--- a/tests/data/test814
+++ b/tests/data/test814
@@ -19,10 +19,10 @@ CUSTOMREQUEST
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP CHECK mailbox (CUSTOMREQUEST)
- </name>
- <command>
+</name>
+<command>
 imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -u user:secret -X 'CHECK'
 </command>
 </client>

diff --git a/tests/data/test815 b/tests/data/test815
index 4ac24f3adf7128a0bef172561db823cb8b4bdbda..04daef90f0f57ae40850c621e9049a48ffdb972d 100644 (file)
--- a/tests/data/test815
+++ b/tests/data/test815
@@ -23,10 +23,10 @@ CUSTOMREQUEST
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP STORE - delete message (CUSTOMREQUEST)
- </name>
- <command>
+</name>
+<command>
 imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -X 'STORE 123 +Flags \Deleted' -u user:secret -: imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -X CLOSE -u user:secret
 </command>
 </client>

diff --git a/tests/data/test816 b/tests/data/test816
index cf4702d149ed2cca957dd244ab7bfba1c46ea4ba..b6054cacfcd62b6c8145f44f14f89db6594d3824 100644 (file)
--- a/tests/data/test816
+++ b/tests/data/test816
@@ -26,10 +26,10 @@ CUSTOMREQUEST
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP STORE - delete message with confirmation (CUSTOMREQUEST)
- </name>
- <command>
+</name>
+<command>
 imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -X 'STORE 123 +Flags \Deleted' -u user:secret -: imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -X EXPUNGE -u user:secret
 </command>
 </client>

diff --git a/tests/data/test817 b/tests/data/test817
index 9efa06d46eed210e28d183eda89e9802eee75e57..c608f65b0fd0db6c5d2288cba72cd1cd9b7ab14e 100644 (file)
--- a/tests/data/test817
+++ b/tests/data/test817
@@ -19,10 +19,10 @@ CUSTOMREQUEST
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP COPY message to mailbox (CUSTOMREQUEST)
- </name>
- <command>
+</name>
+<command>
 imap://%HOSTIP:%IMAPPORT -u user:secret -X 'COPY 123 %TESTNUMBER'
 </command>
 </client>

diff --git a/tests/data/test818 b/tests/data/test818
index 95282c4e367718b2180bf380aff25495ecef5dbe..dd917ea3999e4676d5b49e6a6e8285fa39c20fc7 100644 (file)
--- a/tests/data/test818
+++ b/tests/data/test818
@@ -25,10 +25,10 @@ CUSTOMREQUEST
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP NOOP (CUSTOMREQUEST)
- </name>
- <command>
+</name>
+<command>
 imap://%HOSTIP:%IMAPPORT -X NOOP -u user:secret
 </command>
 </client>

diff --git a/tests/data/test819 b/tests/data/test819
index d2f0db201ca8ee88877956fb6039ea90df515504..50ff2266912642de592def0032b1408df40c2be4 100644 (file)
--- a/tests/data/test819
+++ b/tests/data/test819
@@ -33,10 +33,10 @@ body
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP plain authentication
- </name>
- <command>
+</name>
+<command>
 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret
 </command>
 </client>

diff --git a/tests/data/test82 b/tests/data/test82
index 9139833230a80e064e0a13f4881dacbf8830cf64..a4286ad0967b5aa497478b42e1d09a4e835bbfac 100644 (file)
--- a/tests/data/test82
+++ b/tests/data/test82
@@ -31,10 +31,10 @@ proxy
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with proxy requiring NTLM, but we send Basic
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy-user testuser:testpass -x http://%HOSTIP:%HTTPPORT
 </command>
 </client>

diff --git a/tests/data/test820 b/tests/data/test820
index 8b684acad6c8124434d4282c0fb3142ff6aa2bef..80ac25f27dc2b1279cc76977d351bcc5acbbbdb4 100644 (file)
--- a/tests/data/test820
+++ b/tests/data/test820
@@ -33,10 +33,10 @@ body
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP login authentication
- </name>
- <command>
+</name>
+<command>
 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret
 </command>
 </client>

diff --git a/tests/data/test821 b/tests/data/test821
index 179574beed025d54083fc31c8d97f02e24090bee..101c40084d0c6eede9d8cf4d3f0c51cb7333d435 100644 (file)
--- a/tests/data/test821
+++ b/tests/data/test821
@@ -36,10 +36,10 @@ imap
 <features>
 crypto
 </features>
- <name>
+<name>
 IMAP CRAM-MD5 authentication
- </name>
- <command>
+</name>
+<command>
 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret
 </command>
 </client>

diff --git a/tests/data/test823 b/tests/data/test823
index affb6772d6f74dcb27aea76ace0a54d70bffa8b6..18ed5fa6741c76906451463283327a187231ff29 100644 (file)
--- a/tests/data/test823
+++ b/tests/data/test823
@@ -39,10 +39,10 @@ imap
 debug
 crypto
 </features>
- <name>
+<name>
 IMAP DIGEST-MD5 authentication
- </name>
- <command>
+</name>
+<command>
 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret
 </command>
 </client>

diff --git a/tests/data/test824 b/tests/data/test824
index 28630e48039b7b1f1fadbd55cbc6f74a1d53579c..0abda22b0a29d7bcca76c18ffb961106338cc6a0 100644 (file)
--- a/tests/data/test824
+++ b/tests/data/test824
@@ -33,10 +33,10 @@ body
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP OAuth 2.0 (XOAUTH2) authentication
- </name>
- <command>
+</name>
+<command>
 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
 </client>

diff --git a/tests/data/test825 b/tests/data/test825
index fd4e047a385c021a382896493cb35e5de1adbea4..64d57f5feb30dc47696f5494c86ba552a28b5c39 100644 (file)
--- a/tests/data/test825
+++ b/tests/data/test825
@@ -34,10 +34,10 @@ body
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP plain authentication with initial response
- </name>
- <command>
+</name>
+<command>
 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret
 </command>
 </client>

diff --git a/tests/data/test826 b/tests/data/test826
index 19247f0ec1a16912ee0546c1b35e632c103d52ab..b3b0dc335f9af2f4dbb4e7444448fb2b4f2757be 100644 (file)
--- a/tests/data/test826
+++ b/tests/data/test826
@@ -34,10 +34,10 @@ body
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP login authentication with initial response
- </name>
- <command>
+</name>
+<command>
 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret
 </command>
 </client>

diff --git a/tests/data/test828 b/tests/data/test828
index 40f2b1252fa3745df371df0a0e999bc63ac91f4c..a3548464e88129da23cd9532e5282416ae1fb17a 100644 (file)
--- a/tests/data/test828
+++ b/tests/data/test828
@@ -34,10 +34,10 @@ body
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP OAuth 2.0 (XOAUTH2) authentication with initial response
- </name>
- <command>
+</name>
+<command>
 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
 </client>

diff --git a/tests/data/test829 b/tests/data/test829
index 46ff4e165af4834ef46aba68d84e6613d2bc14da..b9f7da03cc833d951155777681005034694c0749 100644 (file)
--- a/tests/data/test829
+++ b/tests/data/test829
@@ -11,10 +11,10 @@ CRLF-in-URL
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP with URL-encoded CR LF in the URL
- </name>
- <command>
+</name>
+<command>
 imap://%HOSTIP:%IMAPPORT/%0d%0a/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test83 b/tests/data/test83
index dffdb92a588224a10dbcf3bfacaf09f897db5483..51a3e3b68ba4e512b85d215bf90df8415d979c64 100644 (file)
--- a/tests/data/test83
+++ b/tests/data/test83
@@ -46,10 +46,10 @@ contents
 http
 http-proxy
 </server>
- <name>
+<name>
 HTTP over proxy-tunnel with site authentication
- </name>
- <command>
+</name>
+<command>
 http://test.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER -p -x %HOSTIP:%PROXYPORT --user 'iam:my:;self'
 </command>
 <features>

diff --git a/tests/data/test830 b/tests/data/test830
index d02ed6b08f0567348af23d845614bce7fecf6504..64172f1b5acce1083007b38a40df8dd4519e0350 100644 (file)
--- a/tests/data/test830
+++ b/tests/data/test830
@@ -29,10 +29,10 @@ imap
 <features>
 crypto
 </features>
- <name>
+<name>
 IMAP CRAM-MD5 graceful cancellation
- </name>
- <command>
+</name>
+<command>
 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret
 </command>
 </client>

diff --git a/tests/data/test831 b/tests/data/test831
index 99e0fa4b29fb045e69802af0b7055b76e736a0fb..382432368dfc1799bcecfbf12323224ad32866c2 100644 (file)
--- a/tests/data/test831
+++ b/tests/data/test831
@@ -31,16 +31,16 @@ NTLM
 SSL
 !SSPI
 </features>
- <name>
+<name>
 IMAP NTLM graceful cancellation
- </name>
+</name>
  <setenv>
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
- <command>
+<command>
 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u testuser:testpass
 </command>
 <precheck>

diff --git a/tests/data/test832 b/tests/data/test832
index dc15aa716fcb2679b1491c646a5042a3145c53db..6001c1d450cbd5e5d1eed566103d6f993e0613c1 100644 (file)
--- a/tests/data/test832
+++ b/tests/data/test832
@@ -31,10 +31,10 @@ imap
 debug
 crypto
 </features>
- <name>
+<name>
 IMAP DIGEST-MD5 graceful cancellation
- </name>
- <command>
+</name>
+<command>
 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret
 </command>
 </client>

diff --git a/tests/data/test833 b/tests/data/test833
index 5784c416408ff687d86469ea8fef8637850fbaa9..f958df4cb3c06174029f3b6183fb29833193d0ce 100644 (file)
--- a/tests/data/test833
+++ b/tests/data/test833
@@ -40,10 +40,10 @@ imap
 <features>
 crypto
 </features>
- <name>
+<name>
 IMAP CRAM-MD5 authentication with SASL downgrade
- </name>
- <command>
+</name>
+<command>
 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret
 </command>
 </client>

diff --git a/tests/data/test834 b/tests/data/test834
index f99d9dd5dc35f287579c0a35d5575f46431a7fb9..e142ca2196dcda04624e0bfeb1778ef375cd36b7 100644 (file)
--- a/tests/data/test834
+++ b/tests/data/test834
@@ -42,16 +42,16 @@ NTLM
 SSL
 !SSPI
 </features>
- <name>
+<name>
 IMAP NTLM authentication with SASL downgrade
- </name>
+</name>
  <setenv>
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
- <command>
+<command>
 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret
 </command>
 <precheck>

diff --git a/tests/data/test835 b/tests/data/test835
index fd6badde12e985ec7ce72517f31943f8e52a4584..ee6ed31d14eb9b480d45ece5236d8d68dcbd9c5d 100644 (file)
--- a/tests/data/test835
+++ b/tests/data/test835
@@ -42,10 +42,10 @@ imap
 debug
 crypto
 </features>
- <name>
+<name>
 IMAP DIGEST-MD5 authentication with SASL downgrade
- </name>
- <command>
+</name>
+<command>
 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret
 </command>
 </client>

diff --git a/tests/data/test836 b/tests/data/test836
index 0e7914f6261f89d6d6e00ee0a89b032779fb1109..821d5392bb8c063481a03256aeb43e11b29c5ff9 100644 (file)
--- a/tests/data/test836
+++ b/tests/data/test836
@@ -32,10 +32,10 @@ body
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP multiple connection authentication
- </name>
- <command>
+</name>
+<command>
 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user.one:secret -: 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;UID=2' -u user.two:secret
 </command>
 </client>

diff --git a/tests/data/test837 b/tests/data/test837
index 2e46be622e2cdb7bb5b13bcc4cffed7fbc799220..74b575a6ed7f9818101b326464852f1dec3c126f 100644 (file)
--- a/tests/data/test837
+++ b/tests/data/test837
@@ -33,10 +33,10 @@ body
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP external authentication
- </name>
- <command>
+</name>
+<command>
 'imap://user;AUTH=EXTERNAL@%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1'
 </command>
 </client>

diff --git a/tests/data/test838 b/tests/data/test838
index 11ed7aaf09dbc0bf644cf6e5c834bfec77e3704f..c6081fb6386f06c2c13a8b94911cf6265778f1f0 100644 (file)
--- a/tests/data/test838
+++ b/tests/data/test838
@@ -33,10 +33,10 @@ body
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP external authentication without credentials
- </name>
- <command>
+</name>
+<command>
 'imap://;AUTH=EXTERNAL@%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1'
 </command>
 </client>

diff --git a/tests/data/test839 b/tests/data/test839
index 8240bf3973ff0346ce5b78f824b1400df3c27bed..9f443b42aab4a25bf636a410dc76503af41ac547 100644 (file)
--- a/tests/data/test839
+++ b/tests/data/test839
@@ -34,10 +34,10 @@ body
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP external authentication with initial response
- </name>
- <command>
+</name>
+<command>
 'imap://user;AUTH=EXTERNAL@%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1'
 </command>
 </client>

diff --git a/tests/data/test84 b/tests/data/test84
index cc7626294c1718de780d55f14bfcfe2d32273a75..3b842eaffe8398a3956a8020eca9204a1667f53f 100644 (file)
--- a/tests/data/test84
+++ b/tests/data/test84
@@ -27,10 +27,10 @@ contents
 <server>
 http
 </server>
- <name>
+<name>
 HTTP over proxy with site authentication
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT --user iam:myself
 </command>
 <features>

diff --git a/tests/data/test840 b/tests/data/test840
index 551005359d67ef963f9bfe3e8ba14b1fd66d8357..48fd32a34949685e9ab16974812d749c761a62e4 100644 (file)
--- a/tests/data/test840
+++ b/tests/data/test840
@@ -34,10 +34,10 @@ body
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP external authentication with initial response without credentials
- </name>
- <command>
+</name>
+<command>
 'imap://;AUTH=EXTERNAL@%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1'
 </command>
 </client>

diff --git a/tests/data/test841 b/tests/data/test841
index c5258c920e4fdcc7635c6babf43a9a161cd64ed4..cc1d075fbc3f05ad835bdd06ef0a57e48b9bc719 100644 (file)
--- a/tests/data/test841
+++ b/tests/data/test841
@@ -29,10 +29,10 @@ body
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP custom request doesn't check continuation data
- </name>
- <command>
+</name>
+<command>
  imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/ -u user:secret -X 'FETCH 123 BODY[1]'
 </command>
 </client>

diff --git a/tests/data/test842 b/tests/data/test842
index 42148d03eabb5f09cee2b0c1b580891fdf7fb7a9..1cea6e39d35fb4721877b85f90636500af50d23f 100644 (file)
--- a/tests/data/test842
+++ b/tests/data/test842
@@ -34,10 +34,10 @@ body
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP OAuth 2.0 (OAUTHBEARER) authentication
- </name>
- <command>
+</name>
+<command>
 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
 # The protocol section doesn't support ways of specifying the raw data in the

diff --git a/tests/data/test843 b/tests/data/test843
index dcf5c1be40ac92908e149be71bf392f957448c3a..774c4c5e74b4f8b33466cfdf19cf1a9c00aae587 100644 (file)
--- a/tests/data/test843
+++ b/tests/data/test843
@@ -35,10 +35,10 @@ body
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP OAuth 2.0 (OAUTHBEARER) authentication with initial response
- </name>
- <command>
+</name>
+<command>
 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
 </client>

diff --git a/tests/data/test844 b/tests/data/test844
index 83dff8e5977cb5b2d7817777277014fdaa43a8b6..fd65d750c6349413963ec7114abad10170a7dde7 100644 (file)
--- a/tests/data/test844
+++ b/tests/data/test844
@@ -25,10 +25,10 @@ REPLY %b64[n,a=user,%01host=127.0.0.1%01port=%IMAPPORT%01auth=Bearer mF_9.B5f-4.
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP OAuth 2.0 (OAUTHBEARER) failure as continuation
- </name>
- <command>
+</name>
+<command>
 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
 </client>

diff --git a/tests/data/test845 b/tests/data/test845
index d622f0cdca9ed41dd646361a55d467bad68fbfc1..b03cd315cf950f7763d0e10b1e73458cdfb15aa2 100644 (file)
--- a/tests/data/test845
+++ b/tests/data/test845
@@ -27,10 +27,10 @@ REPLY AQ== A002 NO Authentication failed
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP OAuth 2.0 (OAUTHBEARER) failure as continuation with initial response
- </name>
- <command>
+</name>
+<command>
 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
 </client>

diff --git a/tests/data/test846 b/tests/data/test846
index b04561b89815de26d18b544d32c005c321a02602..49c391ffe9a778d5fa8ec16ae41c45b93edf2d0b 100644 (file)
--- a/tests/data/test846
+++ b/tests/data/test846
@@ -29,10 +29,10 @@ body
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP PREAUTH response
- </name>
- <command>
+</name>
+<command>
 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u notused:still-provided
 </command>
 </client>

diff --git a/tests/data/test847 b/tests/data/test847
index 5a68f1c6ef1baa4fe49fbd8984a607c07eac180d..6972f45fb129a352c0e3952007b123719946c1f9 100644 (file)
--- a/tests/data/test847
+++ b/tests/data/test847
@@ -27,10 +27,10 @@ body
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP FETCH message
- </name>
- <command>
+</name>
+<command>
 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;UID=1' -u '"user:sec"ret{'
 </command>
 </client>

diff --git a/tests/data/test848 b/tests/data/test848
index 27efe8ae051cd56438ffe7e4dffabb8603ad84cb..a0d5a29e7de8ab0045ff886057ab6b5ff4891f99 100644 (file)
--- a/tests/data/test848
+++ b/tests/data/test848
@@ -33,10 +33,10 @@ body
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP plain authentication with alternative authorization identity
- </name>
- <command>
+</name>
+<command>
 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret --sasl-authzid shared-mailbox
 </command>
 </client>

diff --git a/tests/data/test849 b/tests/data/test849
index 20fca6b943ec56e1295e6d59b43d91aa0e49178a..d0dcb45e4d8df7fddfd1022d9d2c83e48972300c 100644 (file)
--- a/tests/data/test849
+++ b/tests/data/test849
@@ -24,10 +24,10 @@ REPLY dXJzZWwAa3VydAB4aXBqM3BsbXE= A002 NO Not authorized
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP plain authentication with alternative authorization identity (Not authorized)
- </name>
- <command>
+</name>
+<command>
 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u kurt:xipj3plmq --sasl-authzid ursel
 </command>
 </client>

diff --git a/tests/data/test85 b/tests/data/test85
index afddd9ca626c8db0b6f447c4ea398e67d7ca30f9..b70dbb818205b42bd5ee3ae6b34bbccf636574f7 100644 (file)
--- a/tests/data/test85
+++ b/tests/data/test85
@@ -30,10 +30,10 @@ contents
 <server>
 http
 </server>
- <name>
+<name>
 HTTP over proxy with site and proxy authentication
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT --user iam:myself --proxy-user testing:this
 </command>
 <features>

diff --git a/tests/data/test850 b/tests/data/test850
index 5b6a20f1c5796af902ec393fe036af6d739e5669..f0a9f17d65d828f0d984e084f52c1c5a8d4842be 100644 (file)
--- a/tests/data/test850
+++ b/tests/data/test850
@@ -27,10 +27,10 @@ body
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 RETR message
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>

diff --git a/tests/data/test851 b/tests/data/test851
index e47517f36aba383ca53503681e19889f59ed9c0a..3f24c14b34e36eacac4e148b61d231eaaa1235cd 100644 (file)
--- a/tests/data/test851
+++ b/tests/data/test851
@@ -22,10 +22,10 @@ REPLY LIST +OK %TESTNUMBER 100\r\n.
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 LIST one message
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -l -u user:secret
 </command>
 </client>

diff --git a/tests/data/test852 b/tests/data/test852
index 2234087ee04b6b98545eeccbde308dae537d1237..ed433862bfbe58e03a263f674d6b64b79859dcba 100644 (file)
--- a/tests/data/test852
+++ b/tests/data/test852
@@ -22,10 +22,10 @@ REPLY LIST -ERR no such message
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 LIST invalid message
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -l -u user:secret
 </command>
 </client>

diff --git a/tests/data/test853 b/tests/data/test853
index 468e07848c38eb48f674dd20a17ae8abc5beb0b7..de5236420ddf2edffc613b56ac4f616bec4ae69c 100644 (file)
--- a/tests/data/test853
+++ b/tests/data/test853
@@ -31,10 +31,10 @@ SLOWDOWN
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 LIST messages from *SLOW* server
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT/ -u user:secret
 </command>
 </client>

diff --git a/tests/data/test854 b/tests/data/test854
index a8a18b689501b94966b9d4313132ed472d025220..acb32b01f387d73fc8c5c6de33f29f978f588c16 100644 (file)
--- a/tests/data/test854
+++ b/tests/data/test854
@@ -23,10 +23,10 @@ REPLY LIST +OK but no messages\r\n.
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 LIST no messages available
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT/ -u user:secret
 </command>
 </client>

diff --git a/tests/data/test855 b/tests/data/test855
index 0ab1ab39717236d13b4313e1f98641b1c09c7697..c7c10be6517b19d907dee6e889dddd15e17df7c8 100644 (file)
--- a/tests/data/test855
+++ b/tests/data/test855
@@ -22,10 +22,10 @@ REPLY RETR -ERR no such message
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 RETR invalid message
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>

diff --git a/tests/data/test856 b/tests/data/test856
index efff9d0aa1d017bf25762ad7edc1dc7d281314a4..c107612deed061b5b9ee876b44b02655a423fe03 100644 (file)
--- a/tests/data/test856
+++ b/tests/data/test856
@@ -21,10 +21,10 @@ REPLY PASS -ERR Login failure
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 invalid login
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:wrong
 </command>
 </client>

diff --git a/tests/data/test857 b/tests/data/test857
index 15cc4c805868995a26c476d69c0615f3763bfab3..5868a2d57ffdaf9d601653c20173137c2e665722 100644 (file)
--- a/tests/data/test857
+++ b/tests/data/test857
@@ -38,10 +38,10 @@ To: fake@nowhere
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 RETR message with dot-prefixed line
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>

diff --git a/tests/data/test858 b/tests/data/test858
index c4af2f7dd708cb8424f4876e993c32ed7e93f7bf..f119100ecdaf6943ab3c11745f578f971acf481e 100644 (file)
--- a/tests/data/test858
+++ b/tests/data/test858
@@ -19,10 +19,10 @@ CUSTOMREQUEST
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 DELE message (CUSTOMREQUEST)
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret -X DELE -I
 </command>
 </client>

diff --git a/tests/data/test859 b/tests/data/test859
index 3d2e1c766bf3fca3a4a7c14f61a388274f3e2c1c..11ffc068e54274b2db10a3e84cb80a5992a4feef 100644 (file)
--- a/tests/data/test859
+++ b/tests/data/test859
@@ -19,10 +19,10 @@ CUSTOMREQUEST
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 STAT (CUSTOMREQUEST)
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT -u user:secret -X STAT -I
 </command>
 </client>

diff --git a/tests/data/test86 b/tests/data/test86
index 62284e942f33fa3b2f6bb7f2dbaa46c706ada3d5..ba9c90d7a8f74b568219ee894d9e5df86fc96f2b 100644 (file)
--- a/tests/data/test86
+++ b/tests/data/test86
@@ -53,9 +53,9 @@ crap data
 <server>
 http
 </server>
- <name>
+<name>
 HTTP, urlglob []-retrieval and -o #[num] usage
- </name>
+</name>
  <command option="no-output">
 "http://%HOSTIP:%HTTPPORT/[%TESTNUMBER0001-%TESTNUMBER0003]" -o "%LOGDIR/dumpit#1.dump"
 </command>

diff --git a/tests/data/test860 b/tests/data/test860
index 26809bf34619f4c46186c79e4d9d32c8d6f4d364..5e1f3f611b2712abd14df48a4d11cb09467243c6 100644 (file)
--- a/tests/data/test860
+++ b/tests/data/test860
@@ -19,10 +19,10 @@ CUSTOMREQUEST
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 NOOP (CUSTOMREQUEST)
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT -u user:secret -X NOOP -I
 </command>
 </client>

diff --git a/tests/data/test861 b/tests/data/test861
index 4cc3987421e4c2dc253a0a2b88d383a4f7d983e9..65b44c1cc0b8b7d41e8219dab4ad4079b5bf6729 100644 (file)
--- a/tests/data/test861
+++ b/tests/data/test861
@@ -30,10 +30,10 @@ CAPA UIDL USER
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 UIDL (CUSTOMREQUEST)
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT -u user:secret -X UIDL
 </command>
 </client>

diff --git a/tests/data/test862 b/tests/data/test862
index 47b37bba72588c7e73d362048ea34fe22a93009c..ab0feaa4838a0cb169a04f7dd7ee065dde303321 100644 (file)
--- a/tests/data/test862
+++ b/tests/data/test862
@@ -28,10 +28,10 @@ To: fake@nowhere
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 retrieve message header (CUSTOMREQUEST)
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT -u user:secret -X 'TOP %TESTNUMBER 0'
 </command>
 </client>

diff --git a/tests/data/test863 b/tests/data/test863
index 940045f6917ed2744b54956c1c1ffaf8f1a74ca3..f7b288baa607e3a8d623175446c1848f8144fd72 100644 (file)
--- a/tests/data/test863
+++ b/tests/data/test863
@@ -19,10 +19,10 @@ CUSTOMREQUEST
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 RSET (CUSTOMREQUEST)
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT -u user:secret -X RSET -I
 </command>
 </client>

diff --git a/tests/data/test864 b/tests/data/test864
index 9f2ba125bf2d83cadbc6c53cb80150a18bac88ba..4f40a52ab0291c0f01607d37cdd50456361dc77b 100644 (file)
--- a/tests/data/test864
+++ b/tests/data/test864
@@ -33,10 +33,10 @@ pop3
 <features>
 crypto
 </features>
- <name>
+<name>
 POP3 APOP authentication
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>

diff --git a/tests/data/test865 b/tests/data/test865
index 9d931b53a7408557304d6581d52268db2729a0d9..59bf1c154b5b44f88a364baeaabafc47dde5810d 100644 (file)
--- a/tests/data/test865
+++ b/tests/data/test865
@@ -35,10 +35,10 @@ body
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 plain authentication
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>

diff --git a/tests/data/test866 b/tests/data/test866
index 72e5c0339ef57612cd19e6628a9f548e173ac1af..adab0d8960365bac29a746cd695c8da9a7895388 100644 (file)
--- a/tests/data/test866
+++ b/tests/data/test866
@@ -35,10 +35,10 @@ body
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 login authentication
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>

diff --git a/tests/data/test867 b/tests/data/test867
index 5d59aa97c524f9559fbaa45bb4d401bbc0738f33..5be5ad6fb8ee78364c6bd3c8b0aa9c4ef99be614 100644 (file)
--- a/tests/data/test867
+++ b/tests/data/test867
@@ -38,10 +38,10 @@ pop3
 <features>
 crypto
 </features>
- <name>
+<name>
 POP3 CRAM-MD5 authentication
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>

diff --git a/tests/data/test869 b/tests/data/test869
index 0613e2f5135c32b9ecff417f43c9b10b064ad631..59900df0878a3f14e0e6f96a310c65b23bf2b490 100644 (file)
--- a/tests/data/test869
+++ b/tests/data/test869
@@ -41,10 +41,10 @@ pop3
 debug
 crypto
 </features>
- <name>
+<name>
 POP3 DIGEST-MD5 authentication
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>

diff --git a/tests/data/test87 b/tests/data/test87
index 5cf7de5a7308fc8dd4098697aac01a2f994050b6..f5d689d45d3b75c082f3c48e2f4e541c10557cdf 100644 (file)
--- a/tests/data/test87
+++ b/tests/data/test87
@@ -36,9 +36,9 @@ http
 <features>
 http
 </features>
- <name>
+<name>
 urlglob with out of range -o #[num] usage
- </name>
+</name>
  <command option="no-output">
 "http://%HOSTIP:%HTTPPORT/[%TESTNUMBER0001-%TESTNUMBER0002]" -o "%LOGDIR/dumpit%TESTNUMBER-#2.dump"
 </command>

diff --git a/tests/data/test870 b/tests/data/test870
index 30f3586c841d2715e1279497acfd6d0e93e30a1a..b1329da9aa17d2f66084b7a20539c8567116d2be 100644 (file)
--- a/tests/data/test870
+++ b/tests/data/test870
@@ -35,10 +35,10 @@ body
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 OAuth 2.0 (XOAUTH2) authentication
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
 </client>

diff --git a/tests/data/test871 b/tests/data/test871
index 00adefd3877999dd53130887cbb71fcc002758bf..38335177d4d5b989b5e6b222222a1451754b4ee6 100644 (file)
--- a/tests/data/test871
+++ b/tests/data/test871
@@ -35,10 +35,10 @@ body
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 plain authentication with initial response
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret --sasl-ir
 </command>
 </client>

diff --git a/tests/data/test872 b/tests/data/test872
index 19cd49a9774685131fd6977db9f10f73b15dadc2..f6c5974262fd82537efa211f41642befdee1cf16 100644 (file)
--- a/tests/data/test872
+++ b/tests/data/test872
@@ -35,10 +35,10 @@ body
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 login authentication with initial response
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret --sasl-ir
 </command>
 </client>

diff --git a/tests/data/test874 b/tests/data/test874
index 1f19c5c0f0a4cf4b0d7cc699a3fcd750446a726d..810bc49d170b6d45325396d1bf431f0dd1864c8f 100644 (file)
--- a/tests/data/test874
+++ b/tests/data/test874
@@ -35,10 +35,10 @@ body
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 OAuth 2.0 (XOAUTH2) authentication with initial response
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir
 </command>
 </client>

diff --git a/tests/data/test875 b/tests/data/test875
index 8850fab050e2291e7acd975858082806475381fd..88dfbc2d0938b681296e19fde2fcc794f0c1176c 100644 (file)
--- a/tests/data/test875
+++ b/tests/data/test875
@@ -11,10 +11,10 @@ CRLF-in-URL
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 with URL-encoded CR LF in the URL
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT/%0d%0a/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test876 b/tests/data/test876
index ae5ea07a1fd7ddbfe7488de3a2ad7478009e2fd5..a34b97a9d3e80496a941c9e90279f56c0513f8ce 100644 (file)
--- a/tests/data/test876
+++ b/tests/data/test876
@@ -30,10 +30,10 @@ pop3
 <features>
 crypto
 </features>
- <name>
+<name>
 POP3 CRAM-MD5 graceful cancellation
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>

diff --git a/tests/data/test877 b/tests/data/test877
index 65070d099895987fc928e275a51a6aa4ac6512f5..25023706241179a9778baa6c640ad14b97b7cc3e 100644 (file)
--- a/tests/data/test877
+++ b/tests/data/test877
@@ -32,16 +32,16 @@ NTLM
 SSL
 !SSPI
 </features>
- <name>
+<name>
 POP3 NTLM graceful cancellation
- </name>
+</name>
  <setenv>
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
- <command>
+<command>
 pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u testuser:testpass
 </command>
 <precheck>

diff --git a/tests/data/test878 b/tests/data/test878
index 28bd44a7b8d7ffc6221623bb84be6a20edbed4ee..58c2e3007d02d19808b93ff8fbf89c21e1d9880b 100644 (file)
--- a/tests/data/test878
+++ b/tests/data/test878
@@ -32,10 +32,10 @@ pop3
 debug
 crypto
 </features>
- <name>
+<name>
 POP3 DIGEST-MD5 graceful cancellation
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>

diff --git a/tests/data/test879 b/tests/data/test879
index 1b7ca564b396338720accca3da8ba9f612c770ea..c7b99efb89d15b49f16fff9d75bb97cf39eadd59 100644 (file)
--- a/tests/data/test879
+++ b/tests/data/test879
@@ -42,10 +42,10 @@ pop3
 <features>
 crypto
 </features>
- <name>
+<name>
 POP3 CRAM-MD5 authentication with SASL downgrade
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>

diff --git a/tests/data/test88 b/tests/data/test88
index 1ca5d8877578f84ba3e6d59563283374fa8c3aac..e3f68c0ee04793c3fa918f50b541078066adfd1c 100644 (file)
--- a/tests/data/test88
+++ b/tests/data/test88
@@ -59,10 +59,10 @@ http
 !SSPI
 crypto
 </features>
- <name>
+<name>
 HTTP PUT with Digest authorization
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/put%TESTNUMBER -u testuser:testpass --digest
 </command>
 <file name="%LOGDIR/put%TESTNUMBER">

diff --git a/tests/data/test880 b/tests/data/test880
index 9dc00c0f6195d079174dc056e200d26a3758edb4..dfa2e688c6e1765121d5eb0d0e846632114da0c0 100644 (file)
--- a/tests/data/test880
+++ b/tests/data/test880
@@ -44,16 +44,16 @@ NTLM
 SSL
 !SSPI
 </features>
- <name>
+<name>
 POP3 NTLM authentication with SASL downgrade
- </name>
+</name>
  <setenv>
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
- <command>
+<command>
 pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 <precheck>

diff --git a/tests/data/test881 b/tests/data/test881
index 69e31a4319d04e6e06be4568c2166383b98a5b60..7cbdf64ba88bb2a273be253524030075622e2672 100644 (file)
--- a/tests/data/test881
+++ b/tests/data/test881
@@ -44,10 +44,10 @@ pop3
 debug
 crypto
 </features>
- <name>
+<name>
 POP3 DIGEST-MD5 authentication with SASL downgrade
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>

diff --git a/tests/data/test882 b/tests/data/test882
index 163d78d7d5bcddbd46708d80fce332b80eb9030d..b4fa465340b8bbb6a532740691017eac3b3cf621 100644 (file)
--- a/tests/data/test882
+++ b/tests/data/test882
@@ -31,10 +31,10 @@ body
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 multiple connection authentication
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT/%TESTNUMBER001 -u user.one:secret -: pop3://%HOSTIP:%POP3PORT/%TESTNUMBER002 -u user.two:secret
 </command>
 </client>

diff --git a/tests/data/test883 b/tests/data/test883
index 6d5900c2041dd630511193457fd2ef45bc62e36c..943d2782483166edb778e0a3b82c0774b32c6c29 100644 (file)
--- a/tests/data/test883
+++ b/tests/data/test883
@@ -35,10 +35,10 @@ body
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 external authentication
- </name>
- <command>
+</name>
+<command>
 'pop3://user;AUTH=EXTERNAL@%HOSTIP:%POP3PORT/%TESTNUMBER'
 </command>
 </client>

diff --git a/tests/data/test884 b/tests/data/test884
index f0744bf28931b8e93bd5d908536e5ffa40c123f1..611649c2d292dbc6eb2c835b150775c2b77f9f0b 100644 (file)
--- a/tests/data/test884
+++ b/tests/data/test884
@@ -35,10 +35,10 @@ body
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 external authentication without credentials
- </name>
- <command>
+</name>
+<command>
 'pop3://;AUTH=EXTERNAL@%HOSTIP:%POP3PORT/%TESTNUMBER'
 </command>
 </client>

diff --git a/tests/data/test885 b/tests/data/test885
index 7131f16b15435660cd2b7316701bab41d4573e13..6d2383874f59ea7ea4c34a2322c3707cc838885e 100644 (file)
--- a/tests/data/test885
+++ b/tests/data/test885
@@ -35,10 +35,10 @@ body
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 external authentication with initial response
- </name>
- <command>
+</name>
+<command>
 'pop3://user;AUTH=EXTERNAL@%HOSTIP:%POP3PORT/%TESTNUMBER' --sasl-ir
 </command>
 </client>

diff --git a/tests/data/test886 b/tests/data/test886
index f777abbaeffee6cc275731baa6f269ce772d0a46..e926fe21a1330a2e8391ff66a0ca032168778720 100644 (file)
--- a/tests/data/test886
+++ b/tests/data/test886
@@ -35,10 +35,10 @@ body
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 external authentication with initial response without credentials
- </name>
- <command>
+</name>
+<command>
 'pop3://;AUTH=EXTERNAL@%HOSTIP:%POP3PORT/%TESTNUMBER' --sasl-ir
 </command>
 </client>

diff --git a/tests/data/test887 b/tests/data/test887
index 2d0f535df9a84337395eb68f952a71ba90a84ba2..ada1ce1a6b001e4acd509bf3b13a8e0b1fb87e10 100644 (file)
--- a/tests/data/test887
+++ b/tests/data/test887
@@ -36,10 +36,10 @@ body
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 OAuth 2.0 (OAUTHBEARER) authentication
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
 </client>

diff --git a/tests/data/test888 b/tests/data/test888
index b35b9d61c9143f36d396019cb1c73424f9d4d7b2..289f8137e153a54c66542008b89ebbf62d460937 100644 (file)
--- a/tests/data/test888
+++ b/tests/data/test888
@@ -36,10 +36,10 @@ body
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 OAuth 2.0 (OAUTHBEARER) authentication with initial response
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir
 </command>
 </client>

diff --git a/tests/data/test889 b/tests/data/test889
index 155268b98a25ecd1ade80b437253e8cac56ee57f..5abba0e4ed06e7d23a55ae3f6c64692149d4748d 100644 (file)
--- a/tests/data/test889
+++ b/tests/data/test889
@@ -28,10 +28,10 @@ REPLY AQ== -ERR Authentication failed
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 OAuth 2.0 (OAUTHBEARER) failure as continuation
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
 </client>

diff --git a/tests/data/test890 b/tests/data/test890
index e625fcac1aea53cdb625d42c238f6182410ac173..2c396143aa442805b481f9e7dad624498ce7dffc 100644 (file)
--- a/tests/data/test890
+++ b/tests/data/test890
@@ -28,10 +28,10 @@ REPLY AQ== -ERR Authentication failed
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 OAuth 2.0 (OAUTHBEARER) failure as continuation with initial response
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir
 </command>
 </client>

diff --git a/tests/data/test891 b/tests/data/test891
index b2496f8164ce3f28c97e19e942a1c4beb3dcd07d..f022db96a70a2a173ab18d862aa2e4722e52d21b 100644 (file)
--- a/tests/data/test891
+++ b/tests/data/test891
@@ -23,10 +23,10 @@ pop3
 <features>
 crypto
 </features>
- <name>
+<name>
 POP3 with short authentication response
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>

diff --git a/tests/data/test892 b/tests/data/test892
index 5a6a7fd7cffd32ac07b9abb4cdfb17a258daa97d..c77b35da8a7ac7bf9fd3fa2d4dc8bd97d636decf 100644 (file)
--- a/tests/data/test892
+++ b/tests/data/test892
@@ -35,10 +35,10 @@ body
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 plain authentication with alternative authorization identity
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret --sasl-authzid shared-mailbox
 </command>
 </client>

diff --git a/tests/data/test893 b/tests/data/test893
index ca68dd0429727c64faa43f9ecb687b5d8158bd40..dacd1bc864d4379e0a1603ca37a5c474e9abc16e 100644 (file)
--- a/tests/data/test893
+++ b/tests/data/test893
@@ -26,10 +26,10 @@ REPLY dXJzZWwAa3VydAB4aXBqM3BsbXE= -ERR Not authorized
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 plain authentication with alternative authorization identity (Not authorized)
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u kurt:xipj3plmq --sasl-authzid ursel
 </command>
 </client>

diff --git a/tests/data/test894 b/tests/data/test894
index f9866580b2fe3b193f953ddc9f3b797a7c797245..5582066a6406717a9f93ae1defc5e6d9c4cf2428 100644 (file)
--- a/tests/data/test894
+++ b/tests/data/test894
@@ -18,10 +18,10 @@ RETR
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 with CR in username
- </name>
- <command>
+</name>
+<command>
 pop3://user%0dFRIGGING_cmd:secret@%HOSTIP:%POP3PORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test895 b/tests/data/test895
index 520e09410406e93455b905d9ed8690779570445d..dbf17fdc40db7746d2e8f49707488a38183506d1 100644 (file)
--- a/tests/data/test895
+++ b/tests/data/test895
@@ -28,10 +28,10 @@ body
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP with --login-options 'AUTH=*'
- </name>
- <command>
+</name>
+<command>
 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u '"user:sec"ret{' --login-options 'AUTH=*'
 </command>
 </client>

diff --git a/tests/data/test896 b/tests/data/test896
index c972906a45c9a8483a61b7e5912a94c8572bae4e..f9e0ff701b7aa8e2196f681e51f2e5772f93f9c3 100644 (file)
--- a/tests/data/test896
+++ b/tests/data/test896
@@ -19,10 +19,10 @@ FETCH
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP with --login-options 'AUTH=dummy' (failing)
- </name>
- <command>
+</name>
+<command>
 'imap://%HOSTIP:%IMAPPORT/895/;MAILINDEX=1' -u '"user:sec"ret{' --login-options 'AUTH=dummy'
 </command>
 </client>

diff --git a/tests/data/test897 b/tests/data/test897
index 5c4410cc33f8e222f0a99e5bf48d0a5efc8a3338..fe7e1e70a007f99fa72ea434a31f653ecfb9a7f0 100644 (file)
--- a/tests/data/test897
+++ b/tests/data/test897
@@ -27,10 +27,10 @@ POSTFETCH extra stuff sent in the envelope after the body
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP and envelope meta data after body transfer
- </name>
- <command>
+</name>
+<command>
 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=123/;SECTION=1' -u user:secret -D %LOGDIR/head-%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test898 b/tests/data/test898
index 33bcb29126a1afcd4877f498b10c762a73dc7500..c6dba52d6795538779dd64e429ade3e70ec823c0 100644 (file)
--- a/tests/data/test898
+++ b/tests/data/test898
@@ -63,10 +63,10 @@ proxy
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with custom auth and cookies redirected to HTTP on a diff port
- </name>
- <command>
+</name>
+<command>
 -x http://%HOSTIP:%HTTPPORT http://firsthost.com -L -H "Authorization: Basic am9lOnNlY3JldA==" -H "Cookie: userpwd=am9lOnNlY3JldA=="
 </command>
 </client>

diff --git a/tests/data/test9 b/tests/data/test9
index 29b1d842e23955cb6b0901ab52ca6c1c8646942d..90b146e75a339d5b9b23e35d556dd99cd16cd025 100644 (file)
--- a/tests/data/test9
+++ b/tests/data/test9
@@ -26,10 +26,10 @@ Mime
 <server>
 http
 </server>
- <name>
+<name>
 HTTP RFC1867-type formposting
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F name=daniel -F tool=curl -F file=@%LOGDIR/test%TESTNUMBER.txt
 </command>
 # We create this file before the command is invoked!

diff --git a/tests/data/test900 b/tests/data/test900
index a4fc8aa0337839311bd765103c476b16fdc0bb8f..371544b7657adb60c3799e3cd34871e2d7751dfe 100644 (file)
--- a/tests/data/test900
+++ b/tests/data/test900
@@ -16,16 +16,16 @@ SMTP
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP
- </name>
+</name>
 <stdin>
 From: different\r
 To: another\r
 \r
 body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
 </command>
 </client>

diff --git a/tests/data/test901 b/tests/data/test901
index 787365bf0f0d044ee3144ace53ee5d34a1435ec9..a97233d871661d28853ea19e33f0e1302d4f6f5e 100644 (file)
--- a/tests/data/test901
+++ b/tests/data/test901
@@ -16,9 +16,9 @@ SMTP
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP with CRLF-dot-CRLF in data
- </name>
+</name>
 <stdin>
 From: different\r
 To: another\r
@@ -31,7 +31,7 @@ To: another
 \r
 body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
 </command>
 </client>

diff --git a/tests/data/test902 b/tests/data/test902
index 4f651a83b8f1135e0c0c3f4ee4427f26ed90a524..961fc7bfbf82e0ade18ec0721e34ccbe656e7159 100644 (file)
--- a/tests/data/test902
+++ b/tests/data/test902
@@ -21,16 +21,16 @@ REPLY EHLO 500 Command unrecognized
 <server>
 smtp
 </server>
- <name>
+<name>
 RFC821-only SMTP server (EHLO not supported)
- </name>
+</name>
 <stdin>
 From: different\r
 To: another\r
 \r
 body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
 </command>
 </client>

diff --git a/tests/data/test903 b/tests/data/test903
index 8fe3174d3d2d1bfa897d776c164e70e2a296255c..f4d616ec67b07286f152e934e0a3fe74983f2bcb 100644 (file)
--- a/tests/data/test903
+++ b/tests/data/test903
@@ -25,13 +25,13 @@ REPLY AHVzZXIAc2VjcmV0 235 Authenticated
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP plain authentication
- </name>
+</name>
 <stdin>
 mail body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 </client>

diff --git a/tests/data/test904 b/tests/data/test904
index 07914970dd2dcf3e820332e521a71c3fc611d2c4..b5916ef41974553fb5be565c542762d6934299eb 100644 (file)
--- a/tests/data/test904
+++ b/tests/data/test904
@@ -25,13 +25,13 @@ REPLY c2VjcmV0 235 Authenticated
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP login authentication
- </name>
+</name>
 <stdin>
 mail body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 </client>

diff --git a/tests/data/test905 b/tests/data/test905
index d29e9a83527d9a75519a4301257610c47fddb812..de0b08ac3cb02c928c3a4b25ce73cbaec6ec0937 100644 (file)
--- a/tests/data/test905
+++ b/tests/data/test905
@@ -28,13 +28,13 @@ smtp
 <features>
 crypto
 </features>
- <name>
+<name>
 SMTP CRAM-MD5 authentication
- </name>
+</name>
 <stdin>
 mail body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 </client>

diff --git a/tests/data/test907 b/tests/data/test907
index 0ce464c694e2137096d84aaab7c33a3c71bb8c93..12d6e82890063b4a374a168025bd2762d366fae4 100644 (file)
--- a/tests/data/test907
+++ b/tests/data/test907
@@ -31,13 +31,13 @@ smtp
 debug
 crypto
 </features>
- <name>
+<name>
 SMTP DIGEST-MD5 authentication
- </name>
+</name>
 <stdin>
 mail body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 </client>

diff --git a/tests/data/test908 b/tests/data/test908
index b87c4387b78bb1619909f7d2387a5e312576047e..202977a64a1f23643c9409d042a2cfd0852763ea 100644 (file)
--- a/tests/data/test908
+++ b/tests/data/test908
@@ -25,13 +25,13 @@ REPLY dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB 235 Authenticated
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP OAuth 2.0 (XOAUTH2) authentication
- </name>
+</name>
 <stdin>
 mail body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM -T -
 </command>
 </client>

diff --git a/tests/data/test909 b/tests/data/test909
index 6fa4b28d80891a690e526997896ab9690b2ecffa..e054e49351de66116644cbe30f4544ceb1793127 100644 (file)
--- a/tests/data/test909
+++ b/tests/data/test909
@@ -16,16 +16,16 @@ SMTP
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP without SIZE support
- </name>
+</name>
 <file name="%LOGDIR/test%TESTNUMBER.eml">
 From: different\r
 To: another\r
 \r
 body\r
 </file>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T %LOGDIR/test%TESTNUMBER.eml
 </command>
 </client>

diff --git a/tests/data/test91 b/tests/data/test91
index 2fc020128a3d791ad633f831091c4d8e7d8ba5c7..37d8e4e36c0a32ddb9c424b9e8a56016a3795a33 100644 (file)
--- a/tests/data/test91
+++ b/tests/data/test91
@@ -80,9 +80,9 @@ SSL
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with NTLM/Negotiate/Basic, anyauth and user with domain, with size 0
- </name>
+</name>
 <command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --anyauth -u mydomain\\myself:secret
 </command>

diff --git a/tests/data/test910 b/tests/data/test910
index 8787cc0601f0e95509fba2328a78da9e79ab7847..521318ace546f5487922b73a3f9b9c378e226d0f 100644 (file)
--- a/tests/data/test910
+++ b/tests/data/test910
@@ -16,16 +16,16 @@ SMTP
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP without terminating CRLF
- </name>
+</name>
 <stdin nonewline="yes">
 From: different\r
 To: another\r
 \r
 body
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
 </command>
 </client>

diff --git a/tests/data/test911 b/tests/data/test911
index 88631cd3d90cbe2d5934965b4872698ab4435756..b0c5d0eb829dc72e091000109e8d4c73827137b3 100644 (file)
--- a/tests/data/test911
+++ b/tests/data/test911
@@ -16,15 +16,15 @@ SMTP
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP with no mail data
- </name>
+</name>
 
 <stdin nonewline="yes">
 
 </stdin>
 
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
 </command>
 </client>

diff --git a/tests/data/test912 b/tests/data/test912
index dd34a46ea52e961c64a4792691bfbe1e6710d679..4977a4e8217027fb052bc5119cc0a24c3c7bf303 100644 (file)
--- a/tests/data/test912
+++ b/tests/data/test912
@@ -20,16 +20,16 @@ CAPA SIZE
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP with SIZE support
- </name>
+</name>
 <file name="%LOGDIR/test%TESTNUMBER.eml">
 From: different\r
 To: another\r
 \r
 body\r
 </file>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T %LOGDIR/test%TESTNUMBER.eml
 </command>
 </client>

diff --git a/tests/data/test913 b/tests/data/test913
index 48beac64cef3421d1efa93f49b8cc37e61505fcc..a0aed0072b2d5d88ffd1a70c40569e8574edda72 100644 (file)
--- a/tests/data/test913
+++ b/tests/data/test913
@@ -20,16 +20,16 @@ CAPA "SIZE 32"
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP with large message SIZE
- </name>
+</name>
 <file name="%LOGDIR/test%TESTNUMBER.eml">
 From: different\r
 To: another\r
 \r
 body\r
 </file>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T %LOGDIR/test%TESTNUMBER.eml
 </command>
 </client>

diff --git a/tests/data/test914 b/tests/data/test914
index 1843af9fe490554a38a2ffc4d429513527878736..56ae524b0a3baa2b3de0fddf4de41dbe8773f547 100644 (file)
--- a/tests/data/test914
+++ b/tests/data/test914
@@ -19,16 +19,16 @@ REPLY MAIL 501 not fine enough
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP invalid --mail-from
- </name>
+</name>
 <file name="%LOGDIR/test%TESTNUMBER.eml">
 From: different\r
 To: another\r
 \r
 body\r
 </file>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from invalid -T %LOGDIR/test%TESTNUMBER.eml
 </command>
 </client>

diff --git a/tests/data/test915 b/tests/data/test915
index 5d894422173ee5793a054af5a510e9e87bf5fea3..9211c3407997e2a89baf57100b41a31ac5d303a9 100644 (file)
--- a/tests/data/test915
+++ b/tests/data/test915
@@ -16,16 +16,16 @@ SMTP
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP without --mail-from
- </name>
+</name>
 <stdin>
 From: different\r
 To: another\r
 \r
 body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com -T -
 </command>
 </client>

diff --git a/tests/data/test916 b/tests/data/test916
index 2c375ee2e610c3d5538e54099f99db96f1e6b301..677a647fd3ba551366089058c1f325d7f15a90b9 100644 (file)
--- a/tests/data/test916
+++ b/tests/data/test916
@@ -16,16 +16,16 @@ SMTP
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP with invalid --mail-rcpt
- </name>
+</name>
 <stdin>
 From: different\r
 To: another\r
 \r
 body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt invalid --mail-from sender@example.com -T -
 </command>
 </client>

diff --git a/tests/data/test917 b/tests/data/test917
index fcf21ddac411f0d8659c58711ebfe5e070320d5c..d53fbd10c3a3d4770a3b662de7012d5dde3c406c 100644 (file)
--- a/tests/data/test917
+++ b/tests/data/test917
@@ -16,16 +16,16 @@ SMTP
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP with multiple --mail-rcpt
- </name>
+</name>
 <stdin>
 From: different\r
 To: another\r
 \r
 body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient.one@example.com --mail-rcpt recipient.two@example.com --mail-rcpt recipient.three@example.com --mail-rcpt recipient.four@example.com --mail-rcpt recipient.five@example.com --mail-from sender@example.com -T -
 </command>
 </client>

diff --git a/tests/data/test918 b/tests/data/test918
index 817674fb81d15f90d9b3f83e5ef892602229252a..c49128fa9169f7c8d5f5506a22f155564cb99b25 100644 (file)
--- a/tests/data/test918
+++ b/tests/data/test918
@@ -16,16 +16,16 @@ SMTP
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP with multiple and invalid --mail-rcpt
- </name>
+</name>
 <stdin>
 From: different\r
 To: another\r
 \r
 body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient.one@example.com --mail-rcpt invalid --mail-rcpt recipient.three@example.com --mail-rcpt sTrAnGe --mail-rcpt recipient.five@example.com --mail-from sender@example.com -T -
 </command>
 </client>

diff --git a/tests/data/test919 b/tests/data/test919
index 8c49abd264aaf1a679d5458c80b5d5ce759f24f2..833a67c97b50e3098f4b6d92c533bc6a73c48cae 100644 (file)
--- a/tests/data/test919
+++ b/tests/data/test919
@@ -25,13 +25,13 @@ REPLY AUTH 235 Authenticated
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP plain authentication with initial response
- </name>
+</name>
 <stdin>
 mail body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret --sasl-ir -T -
 </command>
 </client>

diff --git a/tests/data/test92 b/tests/data/test92
index 1c09e97bfe41eae0d415e5cc772ce2acac12521e..f6250d19625341de27a7565e6f4c2874090415a9 100644 (file)
--- a/tests/data/test92
+++ b/tests/data/test92
@@ -44,10 +44,10 @@ Content-Type: image/gif
 <server>
 http
 </server>
- <name>
+<name>
 HTTP resume transfer with the whole file already downloaded
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -C 87
 </command>
 </client>

diff --git a/tests/data/test920 b/tests/data/test920
index 26255188fe8bd7727ba8844e9f0c468c5d9d2146..ac9af7d7bfb9d3ffc1b9e0bb6e1bd02bafc536a1 100644 (file)
--- a/tests/data/test920
+++ b/tests/data/test920
@@ -25,13 +25,13 @@ REPLY c2VjcmV0 235 Authenticated
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP login authentication with initial response
- </name>
+</name>
 <stdin>
 mail body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret --sasl-ir -T -
 </command>
 </client>

diff --git a/tests/data/test922 b/tests/data/test922
index 8c16e4311f23825cfc51d0891566919e5dcc75f9..554c0965a5d6ee57ce9b6b05a6d1362755a9de7e 100644 (file)
--- a/tests/data/test922
+++ b/tests/data/test922
@@ -25,13 +25,13 @@ REPLY AUTH 235 Authenticated
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP OAuth 2.0 (XOAUTH2) authentication with initial response
- </name>
+</name>
 <stdin>
 mail body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir -T -
 </command>
 </client>

diff --git a/tests/data/test923 b/tests/data/test923
index 68a013839fde12456d415fab7c8f8e9ba8f5ac97..19cdd9667e1fb2f38ea8fd25476e81e27071c83a 100644 (file)
--- a/tests/data/test923
+++ b/tests/data/test923
@@ -17,10 +17,10 @@ VRFY
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP VRFY
- </name>
- <command>
+</name>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient
 </command>
 </client>

diff --git a/tests/data/test924 b/tests/data/test924
index c87b2a9d586288c522d3e36a4ecf03a259a692d0..3a37a5e3c86e6edcbf19bc4997fcf97961a94071 100644 (file)
--- a/tests/data/test924
+++ b/tests/data/test924
@@ -23,10 +23,10 @@ VRFY
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP ambiguous VRFY
- </name>
- <command>
+</name>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt smith
 </command>
 </client>

diff --git a/tests/data/test925 b/tests/data/test925
index 3b1801b0c172517e5996b99f1946150e9fed91e4..073f1e3a9be908ac294ede113c2038f07840dac4 100644 (file)
--- a/tests/data/test925
+++ b/tests/data/test925
@@ -20,10 +20,10 @@ VRFY
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP external VRFY
- </name>
- <command>
+</name>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt user@example.net
 </command>
 </client>

diff --git a/tests/data/test926 b/tests/data/test926
index 248cce9a7f248a33dab82420ffcdf31521bef332..4e9623ceb55c4064e82490e4e9574ac36b628d1a 100644 (file)
--- a/tests/data/test926
+++ b/tests/data/test926
@@ -20,10 +20,10 @@ REPLY VRFY 550 Unknown user
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP unknown user VRFY
- </name>
- <command>
+</name>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient
 </command>
 </client>

diff --git a/tests/data/test927 b/tests/data/test927
index a982d147aa98cd956bc953bded9548b7af1bea07..fb86a1940147c1205b769ead753360287385221d 100644 (file)
--- a/tests/data/test927
+++ b/tests/data/test927
@@ -23,10 +23,10 @@ CUSTOMREQUEST
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP mailing list EXPN (CUSTOMREQUEST)
- </name>
- <command>
+</name>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Friends -X EXPN
 </command>
 </client>

diff --git a/tests/data/test928 b/tests/data/test928
index 3ed097957f76b86fe2d72034a98e170d3b9e34eb..4c5ab9eafb5b3d6bcc2e52aa19d7009d40d42c40 100644 (file)
--- a/tests/data/test928
+++ b/tests/data/test928
@@ -21,10 +21,10 @@ HELP
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP HELP
- </name>
- <command>
+</name>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test929 b/tests/data/test929
index be2632829a878bdf1ba5d740461c99b3c55bf0b8..1274921f9bf3737c8d4b90f191d79d3873dfb8cd 100644 (file)
--- a/tests/data/test929
+++ b/tests/data/test929
@@ -18,10 +18,10 @@ CUSTOMREQUEST
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP NOOP (CUSTOMREQUEST)
- </name>
- <command>
+</name>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER -X NOOP -I
 </command>
 </client>

diff --git a/tests/data/test93 b/tests/data/test93
index e0266e68c87e9b6a16bb6f5bb6204b3425092df6..83d2b6102259df9ddb8f5a3223eea38188089bbf 100644 (file)
--- a/tests/data/test93
+++ b/tests/data/test93
@@ -25,10 +25,10 @@ bing
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with failed proxy auth
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -x %HOSTIP:%HTTPPORT
 </command>
 <features>

diff --git a/tests/data/test930 b/tests/data/test930
index ebde938c54c93feff7da0e19847d03e3cbea1512..94a92577617bcee15f033bf375a147f0798223d7 100644 (file)
--- a/tests/data/test930
+++ b/tests/data/test930
@@ -18,10 +18,10 @@ CUSTOMREQUEST
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP RSET (CUSTOMREQUEST)
- </name>
- <command>
+</name>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER -X RSET -I
 </command>
 </client>

diff --git a/tests/data/test931 b/tests/data/test931
index 226f2dd2d3473409b40dff425109b020c82bdf2a..2b6a686c515bdff4bad7eb42c4791d43f882f9b9 100644 (file)
--- a/tests/data/test931
+++ b/tests/data/test931
@@ -11,10 +11,10 @@ CRLF-in-URL
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP with URL-encoded CR LF in the URL
- </name>
- <command>
+</name>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%0d%0a/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test932 b/tests/data/test932
index b6f828cfb62fa568b991638488864e12cbf515bd..e814cc0f728fde0aeb90e6fde9502e5c34b99caa 100644 (file)
--- a/tests/data/test932
+++ b/tests/data/test932
@@ -29,10 +29,10 @@ smtp
 <features>
 crypto
 </features>
- <name>
+<name>
 SMTP CRAM-MD5 graceful cancellation
- </name>
- <command>
+</name>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 </client>

diff --git a/tests/data/test933 b/tests/data/test933
index 518a9b157bc8269093c7d41fed30233d7046e281..71f3893005a5cd79789ad351645d1e9bb96e6b19 100644 (file)
--- a/tests/data/test933
+++ b/tests/data/test933
@@ -31,16 +31,16 @@ NTLM
 SSL
 !SSPI
 </features>
- <name>
+<name>
 SMTP NTLM graceful cancellation
- </name>
+</name>
  <setenv>
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u testuser:testpass -T -
 </command>
 <precheck>

diff --git a/tests/data/test934 b/tests/data/test934
index 87b8571d769588df77f69900b968e44a176771cc..8fd444e9100759bd0f1e855eae1a6d7a9d4696d0 100644 (file)
--- a/tests/data/test934
+++ b/tests/data/test934
@@ -31,10 +31,10 @@ smtp
 debug
 crypto
 </features>
- <name>
+<name>
 SMTP DIGEST-MD5 graceful cancellation
- </name>
- <command>
+</name>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 </client>

diff --git a/tests/data/test935 b/tests/data/test935
index fe106f8bda5d5915df3627938fbf37ba35da1133..bbd4d9475771e30f93d901eba27f9cebebdfac8a 100644 (file)
--- a/tests/data/test935
+++ b/tests/data/test935
@@ -32,13 +32,13 @@ smtp
 <features>
 crypto
 </features>
- <name>
+<name>
 SMTP CRAM-MD5 authentication with SASL downgrade
- </name>
+</name>
 <stdin>
 mail body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 </client>

diff --git a/tests/data/test936 b/tests/data/test936
index 6d8074f2e969281d38c51bd6c08af6d9c5c964a4..f57f63ec86f82557a527d66e595abd8a9bc1970f 100644 (file)
--- a/tests/data/test936
+++ b/tests/data/test936
@@ -34,9 +34,9 @@ NTLM
 SSL
 !SSPI
 </features>
- <name>
+<name>
 SMTP NTLM authentication with SASL downgrade
- </name>
+</name>
 <stdin>
 mail body\r
 </stdin>
@@ -46,7 +46,7 @@ CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 <precheck>

diff --git a/tests/data/test937 b/tests/data/test937
index c2a195ab19ada5680f0c783808db378b65014378..6c361b7387b0e886a856609aef74f6f6e90a10ba 100644 (file)
--- a/tests/data/test937
+++ b/tests/data/test937
@@ -34,13 +34,13 @@ smtp
 debug
 crypto
 </features>
- <name>
+<name>
 SMTP DIGEST-MD5 authentication with SASL downgrade
- </name>
+</name>
 <stdin>
 mail body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 </client>

diff --git a/tests/data/test938 b/tests/data/test938
index be90db30463f4177e5c6f85f448cede047578e0d..475572b070c3d85e8361475f1a8163cf70ad4254 100644 (file)
--- a/tests/data/test938
+++ b/tests/data/test938
@@ -27,13 +27,13 @@ REPLY dXNlci50d28AdXNlci50d28Ac2VjcmV0 235 Authenticated
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP multiple connection authentication
- </name>
+</name>
 <file name="%LOGDIR/upload%TESTNUMBER">
 mail body\r
 </file>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER001 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user.one:secret -T %LOGDIR/upload%TESTNUMBER -: smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER002 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user.two:secret -T %LOGDIR/upload%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test939 b/tests/data/test939
index b385798b68c5d2c984cf600d128f1b4a30825366..e1424d2ddbf4e920361f0f2268dd4a6f4cda6637 100644 (file)
--- a/tests/data/test939
+++ b/tests/data/test939
@@ -20,13 +20,13 @@ REPLY EHLO 500 Command unrecognized
 <server>
 smtp
 </server>
- <name>
+<name>
 RFC821-only SMTP with username and password
- </name>
+</name>
 <stdin>
 mail body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 </client>

diff --git a/tests/data/test94 b/tests/data/test94
index 87b65d13a8876f73308e16d9a09adc2d0b84bf6e..eb745d1df4c7a8d784bd70a6edddfe96e1e183ca 100644 (file)
--- a/tests/data/test94
+++ b/tests/data/test94
@@ -31,10 +31,10 @@ http
 SSL
 proxy
 </features>
- <name>
+<name>
 HTTPS GET with failed proxy auth (CONNECT 1.0)
- </name>
- <command>
+</name>
+<command>
 https://test.anything.really.com:%TESTNUMBER --proxy1.0 %HOSTIP:%HTTPPORT
 </command>
 </client>

diff --git a/tests/data/test940 b/tests/data/test940
index baa0c989448a49c6cf381aeaac86f340d96dc8ee..afc9da0c93744d8be2ad85916b2785233ab8a4c4 100644 (file)
--- a/tests/data/test940
+++ b/tests/data/test940
@@ -16,13 +16,13 @@ SMTP
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP with username and password but no AUTH capability
- </name>
+</name>
 <stdin>
 mail body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 </client>

diff --git a/tests/data/test941 b/tests/data/test941
index a9838375168a271687512f8d9c9d36a6596a5aa7..7c87f50280c356221fc21c6f421a55a506b712fe 100644 (file)
--- a/tests/data/test941
+++ b/tests/data/test941
@@ -17,9 +17,9 @@ SMTP
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP with --crlf
- </name>
+</name>
 <file name="%LOGDIR/upload%TESTNUMBER">
 From: different
 To: another
@@ -33,7 +33,7 @@ with
 the
 --crlf option
 </file>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T %LOGDIR/upload%TESTNUMBER --crlf
 </command>
 </client>

diff --git a/tests/data/test942 b/tests/data/test942
index ae30a9c6e60a36ccc9711e6dca6565ab98afe4e6..2286c20e6fbff8f489467c28e4119393a55a6b6b 100644 (file)
--- a/tests/data/test942
+++ b/tests/data/test942
@@ -25,13 +25,13 @@ REPLY dXNlcg== 235 Authenticated
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP external authentication
- </name>
+</name>
 <stdin>
 mail body\r
 </stdin>
- <command>
+<command>
 'smtp://user;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/%TESTNUMBER' --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
 </command>
 </client>

diff --git a/tests/data/test943 b/tests/data/test943
index 4f403cdff0e2fb896159f6c637216f2ccd0d252c..80e935fede6359ca1464a366c3b0a904e77be59c 100644 (file)
--- a/tests/data/test943
+++ b/tests/data/test943
@@ -25,13 +25,13 @@ REPLY = 235 Authenticated
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP external authentication without credentials
- </name>
+</name>
 <stdin>
 mail body\r
 </stdin>
- <command>
+<command>
 'smtp://;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/%TESTNUMBER' --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
 </command>
 </client>

diff --git a/tests/data/test944 b/tests/data/test944
index 0539a8ae13c258695d0b043f49095fe6b998eb07..0dfaefb7169eb14269fc737c6633f4beb8488827 100644 (file)
--- a/tests/data/test944
+++ b/tests/data/test944
@@ -25,13 +25,13 @@ REPLY AUTH 235 Authenticated
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP external authentication with initial response
- </name>
+</name>
 <stdin>
 mail body\r
 </stdin>
- <command>
+<command>
 'smtp://user;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/%TESTNUMBER' --mail-rcpt recipient@example.com --mail-from sender@example.com --sasl-ir -T -
 </command>
 </client>

diff --git a/tests/data/test945 b/tests/data/test945
index 5a3fb49376f707788a42466c38c00dea2424f793..5b64127644437845dafacf019bf9bd15f707d2ea 100644 (file)
--- a/tests/data/test945
+++ b/tests/data/test945
@@ -25,13 +25,13 @@ REPLY AUTH 235 Authenticated
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP external authentication with initial response without credentials
- </name>
+</name>
 <stdin>
 mail body\r
 </stdin>
- <command>
+<command>
 'smtp://;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/%TESTNUMBER' --mail-rcpt recipient@example.com --mail-from sender@example.com --sasl-ir -T -
 </command>
 </client>

diff --git a/tests/data/test946 b/tests/data/test946
index ea6569380d01d350545fe237cd8466303b9b79a1..b306180aaaca1e325fdb97d5992aa93678b76ec6 100644 (file)
--- a/tests/data/test946
+++ b/tests/data/test946
@@ -26,13 +26,13 @@ REPLY %b64[n,a=user,%01host=127.0.0.1%01port=%SMTPPORT%01auth=Bearer mF_9.B5f-4.
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP OAuth 2.0 (OAUTHBEARER) authentication
- </name>
+</name>
 <stdin>
 mail body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM -T -
 </command>
 </client>

diff --git a/tests/data/test947 b/tests/data/test947
index 290da7114b12ead8e8a235cc779030641b69af09..5ca2be671462aa4b5acbe0f8c1557737b423edce 100644 (file)
--- a/tests/data/test947
+++ b/tests/data/test947
@@ -26,13 +26,13 @@ REPLY AUTH 235 Authenticated
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP OAuth 2.0 (OAUTHBEARER) authentication with initial response
- </name>
+</name>
 <stdin>
 mail body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir -T -
 </command>
 </client>

diff --git a/tests/data/test948 b/tests/data/test948
index 59a492f17939a82eb0ac551b62251530ed908b97..a765fba3d99f46358998ab185d7647b1b3f3e144 100644 (file)
--- a/tests/data/test948
+++ b/tests/data/test948
@@ -27,13 +27,13 @@ REPLY AQ== 535 Username and Password not accepted. Learn more at\r\n535 http://s
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP OAuth 2.0 (OAUTHBEARER) failure as continuation
- </name>
+</name>
 <stdin>
 mail body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM -T -
 </command>
 </client>

diff --git a/tests/data/test949 b/tests/data/test949
index 0c90074956d4c251902c01ff6ccb702d9018c999..136baf4efa00a30d324ed2e92c8a592812fac67c 100644 (file)
--- a/tests/data/test949
+++ b/tests/data/test949
@@ -27,13 +27,13 @@ REPLY AQ== 535 Username and Password not accepted. Learn more at\r\n535 http://s
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP OAuth 2.0 (OAUTHBEARER) failure as continuation with initial response
- </name>
+</name>
 <stdin>
 mail body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir -T -
 </command>
 </client>

diff --git a/tests/data/test95 b/tests/data/test95
index bc82f162f7e099ada44b23865fcd696d6cb6b586..339c02ae4bcb588f011710b2ff5afaf890b66d9c 100644 (file)
--- a/tests/data/test95
+++ b/tests/data/test95
@@ -46,10 +46,10 @@ contents
 http
 http-proxy
 </server>
- <name>
+<name>
 HTTP over proxytunnel using POST
- </name>
- <command>
+</name>
+<command>
 http://test.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER -p -x %HOSTIP:%PROXYPORT -d "datatopost=ohthatsfunyesyes"
 </command>
 <features>

diff --git a/tests/data/test950 b/tests/data/test950
index 3198ab214b6cfb38b32cadae6e1fa4a0ebb40c0c..6628f004343822ae58c9e29ab41fa4f0ab57bad9 100644 (file)
--- a/tests/data/test950
+++ b/tests/data/test950
@@ -21,9 +21,9 @@ VRFY
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP VRFY with custom request
- </name>
+</name>
 
 # the custom request just does it lowercase to remain the same command
 <command>

diff --git a/tests/data/test951 b/tests/data/test951
index 3a3626f7ee0a22bf0d6779d3ac7976f694d236e9..2b9315047188487c90684d9c82ef7177e7e10880 100644 (file)
--- a/tests/data/test951
+++ b/tests/data/test951
@@ -16,9 +16,9 @@ SMTP
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP data with dot as first character
- </name>
+</name>
 <stdin>
 .This first line starts with a dot\r
 </stdin>

diff --git a/tests/data/test952 b/tests/data/test952
index 39b9f76084b41210853af25da24862e10bb27f1e..716310df65dc69122dfe54491fc298ed95e880c7 100644 (file)
--- a/tests/data/test952
+++ b/tests/data/test952
@@ -16,9 +16,9 @@ SMTP
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP data with single dot-only line
- </name>
+</name>
 <stdin>
 .\r
 </stdin>

diff --git a/tests/data/test953 b/tests/data/test953
index e4d0328a6f07b1afaa2acce6706b8739e6b8c3a2..f293f896e8cf0865b67550797300153b869387a7 100644 (file)
--- a/tests/data/test953
+++ b/tests/data/test953
@@ -25,13 +25,13 @@ REPLY dXJzZWwAa3VydAB4aXBqM3BsbXE= 235 Authenticated
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP plain authentication with alternative authorization identity
- </name>
+</name>
 <stdin>
 mail body\r
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u kurt:xipj3plmq --sasl-authzid ursel -T -
 </command>
 </client>

diff --git a/tests/data/test954 b/tests/data/test954
index fa2d591851fe75d1574179b79ef76b74c8c47ac7..698786b4db5560d12c4d5f5a76ffd0b2074f0290 100644 (file)
--- a/tests/data/test954
+++ b/tests/data/test954
@@ -25,13 +25,13 @@ REPLY dXJzZWwAa3VydAB4aXBqM3BsbXE= 501 Not authorized
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP plain authentication with alternative authorization identity (Not authorized)
- </name>
+</name>
 <stdin>
 mail body
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u kurt:xipj3plmq --sasl-authzid ursel -T -
 </command>
 </client>

diff --git a/tests/data/test955 b/tests/data/test955
index 6525baab3919789ee05bd6dc39a008c74e864965..24cc2b7e431468ffad1db31da16c224c6f6dc95f 100644 (file)
--- a/tests/data/test955
+++ b/tests/data/test955
@@ -29,9 +29,9 @@ LC_CTYPE=en_US.UTF-8
 <precheck>
 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
 </precheck>
- <name>
+<name>
 SMTP without SMTPUTF8 support - UTF-8 based sender (local part only)
- </name>
+</name>
 <stdin>
 From: different\r
 To: another\r

diff --git a/tests/data/test956 b/tests/data/test956
index 52d2454a2584bcce72b11a8402bd980be4ccb09e..1180523bbd2b8934640f8982a006d2fcee5b6254 100644 (file)
--- a/tests/data/test956
+++ b/tests/data/test956
@@ -26,9 +26,9 @@ LC_CTYPE=en_US.UTF-8
 <precheck>
 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
 </precheck>
- <name>
+<name>
 SMTP without SMTPUTF8 support - UTF-8 based recipient (local part only)
- </name>
+</name>
 <stdin>
 From: different\r
 To: another\r

diff --git a/tests/data/test957 b/tests/data/test957
index 097385fe2a598cb0ca15f4be585323ea3b88951b..1b01b7e53acaefe5da8b4e204cd1b5f0c7220008 100644 (file)
--- a/tests/data/test957
+++ b/tests/data/test957
@@ -27,9 +27,9 @@ LC_CTYPE=en_US.UTF-8
 <precheck>
 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
 </precheck>
- <name>
+<name>
 SMTP VRFY without SMTPUTF8 support - UTF-8 based recipient (local part only)
- </name>
+</name>
 <command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Användaren
 </command>

diff --git a/tests/data/test958 b/tests/data/test958
index 1df15808404be54c1b187d3163b0e2f56614b56e..3ad77fe1030822dcb9cb84491883185f13bd397a 100644 (file)
--- a/tests/data/test958
+++ b/tests/data/test958
@@ -27,9 +27,9 @@ LC_CTYPE=en_US.UTF-8
 <precheck>
 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
 </precheck>
- <name>
+<name>
 SMTP external VRFY without SMTPUTF8 support - UTF-8 based recipient (local part only)
- </name>
+</name>
 <command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Användaren@example.com
 </command>

diff --git a/tests/data/test959 b/tests/data/test959
index 8bebe40ad2766109f6e7a334fbc17100b0e3cc39..143708df8c5b230c152753b64904f23260533e03 100644 (file)
--- a/tests/data/test959
+++ b/tests/data/test959
@@ -30,9 +30,9 @@ LC_CTYPE=en_US.UTF-8
 <precheck>
 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
 </precheck>
- <name>
+<name>
 SMTP without SMTPUTF8 support - UTF-8 based sender (host part only)
- </name>
+</name>
 <stdin>
 From: different\r
 To: another\r

diff --git a/tests/data/test960 b/tests/data/test960
index 68d8eda7246c2509f88da6ba8b0760959ccd533d..bcb9bf44c5c61d7221e4ffc49b3b7744f868d65b 100644 (file)
--- a/tests/data/test960
+++ b/tests/data/test960
@@ -27,9 +27,9 @@ LC_CTYPE=en_US.UTF-8
 <precheck>
 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
 </precheck>
- <name>
+<name>
 SMTP without SMTPUTF8 support - UTF-8 based recipient (host part only)
- </name>
+</name>
 <stdin>
 From: different\r
 To: another\r

diff --git a/tests/data/test961 b/tests/data/test961
index 9cd10f574527b5c36b9cb11712bff8d909fb67c3..750943ab47e8db7b33cc61972d02b2aae30159fc 100644 (file)
--- a/tests/data/test961
+++ b/tests/data/test961
@@ -28,9 +28,9 @@ LC_CTYPE=en_US.UTF-8
 <precheck>
 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
 </precheck>
- <name>
+<name>
 SMTP external VRFY without SMTPUTF8 support - UTF-8 based recipient (host part only)
- </name>
+</name>
 <command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt user@åäö.se
 </command>

diff --git a/tests/data/test962 b/tests/data/test962
index 0977ab326cac50a3ba6932c5bba61ffa8275f617..503761b46f97988c328825264823ba3d0b620253 100644 (file)
--- a/tests/data/test962
+++ b/tests/data/test962
@@ -28,9 +28,9 @@ LC_CTYPE=en_US.UTF-8
 <precheck>
 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
 </precheck>
- <name>
+<name>
 SMTP without SMTPUTF8 support - UTF-8 based sender (host part only)
- </name>
+</name>
 <stdin>
 From: different\r
 To: another\r

diff --git a/tests/data/test963 b/tests/data/test963
index 4ddc87162242586f30cb043ee69a3f5394612142..1b977f007076bdb7894ae6c6a5230bddf39fb7a9 100644 (file)
--- a/tests/data/test963
+++ b/tests/data/test963
@@ -28,9 +28,9 @@ LC_CTYPE=en_US.UTF-8
 <precheck>
 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
 </precheck>
- <name>
+<name>
 SMTP without SMTPUTF8 support (IDN Enabled) - UTF-8 based recipient (host part only)
- </name>
+</name>
 <stdin>
 From: different\r
 To: another\r

diff --git a/tests/data/test964 b/tests/data/test964
index 7901e0aebf7bdd73529a405ed359aac71cf748cf..e2d69881ae7f85138151be013834a7e5268e6c6e 100644 (file)
--- a/tests/data/test964
+++ b/tests/data/test964
@@ -29,9 +29,9 @@ LC_CTYPE=en_US.UTF-8
 <precheck>
 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
 </precheck>
- <name>
+<name>
 SMTP external VRFY without SMTPUTF8 support (IDN Enabled) - UTF-8 based recipient (host part only)
- </name>
+</name>
 <command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt user@åäö.se
 </command>

diff --git a/tests/data/test965 b/tests/data/test965
index ada2d8e703a044db31176a023a1ea5e16f6b5db8..71adef8f67be51a1c6726632e634afbd8e49ccb0 100644 (file)
--- a/tests/data/test965
+++ b/tests/data/test965
@@ -31,9 +31,9 @@ LC_CTYPE=en_US.UTF-8
 <precheck>
 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
 </precheck>
- <name>
+<name>
 SMTP with SMTPUTF8 support - UTF-8 based sender
- </name>
+</name>
 <stdin>
 From: different\r
 To: another\r

diff --git a/tests/data/test966 b/tests/data/test966
index d2eb7c17c3b285e0e3dd191d9bed58b4f3702f02..acc248a573502fa625e91f8bd19c3d64506882e3 100644 (file)
--- a/tests/data/test966
+++ b/tests/data/test966
@@ -31,9 +31,9 @@ LC_CTYPE=en_US.UTF-8
 <precheck>
 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
 </precheck>
- <name>
+<name>
 SMTP with SMTPUTF8 support - UTF-8 based recipient
- </name>
+</name>
 <stdin>
 From: different\r
 To: another\r

diff --git a/tests/data/test967 b/tests/data/test967
index 87a37ae05de0f2d734c9736595ec10df148ecb6c..95fb153bdc094e272d87148c99fd60695aacf52c 100644 (file)
--- a/tests/data/test967
+++ b/tests/data/test967
@@ -35,9 +35,9 @@ LC_CTYPE=en_US.UTF-8
 <precheck>
 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
 </precheck>
- <name>
+<name>
 SMTP external VRFY with SMTPUTF8 support
- </name>
+</name>
 <command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Användaren@åäö.se
 </command>

diff --git a/tests/data/test968 b/tests/data/test968
index 89b543ae45d7e53da8e2974179aec7501d16f2b0..099f6fd290ce9a24d85ece5bf6a2ca122b0b2f62 100644 (file)
--- a/tests/data/test968
+++ b/tests/data/test968
@@ -32,9 +32,9 @@ LC_CTYPE=en_US.UTF-8
 <precheck>
 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
 </precheck>
- <name>
+<name>
 SMTP VRFY with SMTPUTF8 support
- </name>
+</name>
 <command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Användaren
 </command>

diff --git a/tests/data/test969 b/tests/data/test969
index 860c9d47b4f9e30ed75092a12bdd9aad60af8746..bb4cc316eac0ab93a80ecbce49c773ab28096e92 100644 (file)
--- a/tests/data/test969
+++ b/tests/data/test969
@@ -31,10 +31,10 @@ smtp
 idn
 !win32
 </features>
- <name>
+<name>
 SMTP mailing list EXPN (CUSTOMREQUEST) with SMTPUTF8 support
- </name>
- <command>
+</name>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Friends -X EXPN
 </command>
 </client>

diff --git a/tests/data/test97 b/tests/data/test97
index db36eeb70145e7781cc10c370ee8890d5982e2d1..cc0cf676be51783478d6be90f3e7447fdc35622e 100644 (file)
--- a/tests/data/test97
+++ b/tests/data/test97
@@ -25,10 +25,10 @@ blaha
 <server>
 http
 </server>
- <name>
+<name>
 HTTP POST with custom content-type
- </name>
- <command>
+</name>
+<command>
  -d "hejsanallabarn" -H "Content-Type: silly/type" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test971 b/tests/data/test971
index dada920018f0939e59c7caef2cfb362484f8ecfa..19260dfdfe443248f31cf5623bc1977470c885b2 100644 (file)
--- a/tests/data/test971
+++ b/tests/data/test971
@@ -13,9 +13,9 @@ options-in-versions
 none
 </server>
 
- <name>
+<name>
 Verify that options-in-versions and docs/cmdline-opts are in sync
- </name>
+</name>
 
 <command type="perl">
 %SRCDIR/options-scan.pl %SRCDIR/../docs/options-in-versions %SRCDIR/../docs/cmdline-opts

diff --git a/tests/data/test973 b/tests/data/test973
index 6ced1078965cb2490ad3d7dfa6130ecdd52a9a98..17748ea735027850c729301b1da93e2b1b161353 100644 (file)
--- a/tests/data/test973
+++ b/tests/data/test973
@@ -55,10 +55,10 @@ works
 http
 ftp
 </server>
- <name>
+<name>
 HTTP with auth redirected to FTP w/o auth
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -L -u joe:secret
 </command>
 </client>

diff --git a/tests/data/test974 b/tests/data/test974
index 5a834ac25f49cf55a4ac663652b0cf51aaa487d4..1e7919c1434f7a65cd03aa44a10901f92465175a 100644 (file)
--- a/tests/data/test974
+++ b/tests/data/test974
@@ -61,10 +61,10 @@ proxy
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with auth redirected to HTTP on a diff port w/o auth
- </name>
- <command>
+</name>
+<command>
 -x http://%HOSTIP:%HTTPPORT http://firsthost.com -L -u joe:secret
 </command>
 </client>

diff --git a/tests/data/test975 b/tests/data/test975
index 85e03e4f2c08b7297ec83d120362501aa6d3f029..33f2559c6f9805b4efcbd06d5a71b6c680de42b8 100644 (file)
--- a/tests/data/test975
+++ b/tests/data/test975
@@ -55,10 +55,10 @@ works
 http
 ftp
 </server>
- <name>
+<name>
 HTTP with auth redirected to FTP allowing auth to continue
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --location-trusted -u joe:secret
 </command>
 </client>

diff --git a/tests/data/test976 b/tests/data/test976
index b2d948830666a4d1031af3daaf1b9b7583db3a37..35c8901454c2270a417f9405ef2bb74d2eeaa114 100644 (file)
--- a/tests/data/test976
+++ b/tests/data/test976
@@ -61,10 +61,10 @@ proxy
 <server>
 http
 </server>
- <name>
+<name>
 HTTP with auth redirected to HTTP on a diff port --location-trusted
- </name>
- <command>
+</name>
+<command>
 -x http://%HOSTIP:%HTTPPORT http://firsthost.com --location-trusted -u joe:secret
 </command>
 </client>

diff --git a/tests/data/test977 b/tests/data/test977
index 145a81ba34906be7b5aa3d55315ef12b4726cef4..4f52850a0e8b9d3cbcd9db5a1902ebb6dbfe1940 100644 (file)
--- a/tests/data/test977
+++ b/tests/data/test977
@@ -33,10 +33,10 @@ proxy
 <server>
 http
 </server>
- <name>
+<name>
 URL with trailing dot and receiving a cookie for the TLD with dot
- </name>
- <command>
+</name>
+<command>
 -x http://%HOSTIP:%HTTPPORT http://firsthost.me. -c %LOGDIR/cookies%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test978 b/tests/data/test978
index 16e55920d6b5e55a5264ed349e3d23f0c33e7798..810ffbb04e146d493480198b5763d7937d412aad 100644 (file)
--- a/tests/data/test978
+++ b/tests/data/test978
@@ -31,10 +31,10 @@ Funny-head: yesyes
 <server>
 http
 </server>
- <name>
+<name>
 verify that --stderr works for -w's stderr as well
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --stderr %LOGDIR/redir --silent -w '%{stderr}nonsense\n'
 </command>
 </client>

diff --git a/tests/data/test98 b/tests/data/test98
index 1d89c34fe9849600f49883121382f875390d2e21..ced184b3906008fdcf19d3eccfecfcaa6f208a65 100644 (file)
--- a/tests/data/test98
+++ b/tests/data/test98
@@ -25,10 +25,10 @@ blaha
 <server>
 http
 </server>
- <name>
+<name>
 HTTP PUT from stdin with set size, disabling chunked transfer-encoding
- </name>
- <command>
+</name>
+<command>
  -T - -H "Transfer-Encoding:" -H "Content-Length: 14" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 <stdin>

diff --git a/tests/data/test980 b/tests/data/test980
index 97567f85638a0f85b50d8aeca02dd11bfd3cda95..5811b437d4115dd3f7e26b599fd0f05859c3775f 100644 (file)
--- a/tests/data/test980
+++ b/tests/data/test980
@@ -26,13 +26,13 @@ SSL
 <server>
 smtp
 </server>
- <name>
+<name>
 SMTP STARTTLS pipelined server response
- </name>
+</name>
 <stdin>
 mail body
 </stdin>
- <command>
+<command>
 smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret --ssl --sasl-ir -T -
 </command>
 </client>

diff --git a/tests/data/test981 b/tests/data/test981
index e7941af532d7086b5bb64e8ffa1d91a3023dc63a..02a03fd2f95d3d5380208af780deca0650e22a7c 100644 (file)
--- a/tests/data/test981
+++ b/tests/data/test981
@@ -25,10 +25,10 @@ SSL
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP STARTTLS pipelined server response
- </name>
- <command>
+</name>
+<command>
 imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -u user:secret --ssl
 </command>
 <file name="%LOGDIR/upload%TESTNUMBER">

diff --git a/tests/data/test982 b/tests/data/test982
index 9e07cc0b3f1f7e44a8c426b1da5999ef1fd54f0f..2f5eccc0a4afc906ceefd80ad592470ba6a5e62e 100644 (file)
--- a/tests/data/test982
+++ b/tests/data/test982
@@ -34,10 +34,10 @@ SSL
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 STARTTLS pipelined server response
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret --ssl
  </command>
 </client>

diff --git a/tests/data/test983 b/tests/data/test983
index 203e40a3a721f07cdf84029e6f5cb00959df3da2..a4294495d06292863770d0d92ee7959b54a70418 100644 (file)
--- a/tests/data/test983
+++ b/tests/data/test983
@@ -23,9 +23,9 @@ SSL
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP STARTTLS pipelined server response
- </name>
+</name>
 <file name="%LOGDIR/test%TESTNUMBER.txt">
 data
     to
@@ -34,7 +34,7 @@ that FTPS
 works
   so does it?
 </file>
- <command>
+<command>
 --ssl --ftp-ssl-control ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt -u user:secret -P %CLIENTIP
 </command>
 </client>

diff --git a/tests/data/test984 b/tests/data/test984
index 7887b776c3321fcf0cbdd737f6f21dee290e7687..314a24e6cb5a101bd9343cb435850f767f5159c8 100644 (file)
--- a/tests/data/test984
+++ b/tests/data/test984
@@ -23,10 +23,10 @@ SSL
 <server>
 imap
 </server>
- <name>
+<name>
 IMAP require STARTTLS with failing capabilities
- </name>
- <command>
+</name>
+<command>
 imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -u user:secret --ssl-reqd
 </command>
 <file name="%LOGDIR/upload%TESTNUMBER">

diff --git a/tests/data/test985 b/tests/data/test985
index d0db4aadf5dbb9ab241effcad0a032388fc363e0..0b3cd29ff1142492d894915b0c3fea0cecfced08 100644 (file)
--- a/tests/data/test985
+++ b/tests/data/test985
@@ -32,10 +32,10 @@ SSL
 <server>
 pop3
 </server>
- <name>
+<name>
 POP3 require STARTTLS with failing capabilities
- </name>
- <command>
+</name>
+<command>
 pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret --ssl-reqd
  </command>
 </client>

diff --git a/tests/data/test986 b/tests/data/test986
index ebe12c2914be7af4ac04580a907db219983d4a33..0ed30452af09eeb673ce6e2c353f70cc65211ce2 100644 (file)
--- a/tests/data/test986
+++ b/tests/data/test986
@@ -23,9 +23,9 @@ SSL
 <server>
 ftp
 </server>
- <name>
+<name>
 FTP require STARTTLS while preauthenticated
- </name>
+</name>
 <file name="%LOGDIR/test%TESTNUMBER.txt">
 data
     to
@@ -34,7 +34,7 @@ that FTPS
 works
   so does it?
 </file>
- <command>
+<command>
 --ssl-reqd --ftp-ssl-control ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt -u user:secret
 </command>
 </client>

diff --git a/tests/data/test987 b/tests/data/test987
index 9176748e1e48de81e65fdcd19d2f69299138f031..bf926b7fe25b8f56671bdfff8f1a03112079fd07 100644 (file)
--- a/tests/data/test987
+++ b/tests/data/test987
@@ -16,16 +16,16 @@ SMTPS
 <server>
 smtps
 </server>
- <name>
+<name>
 SMTPS with redundant explicit SSL request
- </name>
+</name>
 <stdin>
 From: different\r
 To: another\r
 \r
 body\r
 </stdin>
- <command>
+<command>
 -k --ssl-reqd --mail-rcpt recipient@example.com --mail-from sender@example.com -T - smtps://%HOSTIP:%SMTPSPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test988 b/tests/data/test988
index 71c873c8b9d07ba3084e23cddcffe1c7e0166d25..31e1c8711b62a021e42f27368278da35487a7271 100644 (file)
--- a/tests/data/test988
+++ b/tests/data/test988
@@ -26,10 +26,10 @@ body
 <server>
 imaps
 </server>
- <name>
+<name>
 IMAPS FETCH with redundant explicit SSL request
- </name>
- <command>
+</name>
+<command>
 -k --ssl-reqd -u '"user:sec"ret{' 'imaps://%HOSTIP:%IMAPSPORT/%TESTNUMBER/;MAILINDEX=1'
 </command>
 </client>

diff --git a/tests/data/test989 b/tests/data/test989
index 2fee9f8954a1ada35629002219eafba88c3b88df..fa41240a20cb0961b2d95816de69ad88c64660ad 100644 (file)
--- a/tests/data/test989
+++ b/tests/data/test989
@@ -26,10 +26,10 @@ body
 <server>
 pop3s
 </server>
- <name>
+<name>
 POP3S RETR with redundant explicit SSL request
- </name>
- <command>
+</name>
+<command>
 -k --ssl-reqd  -u user:secret pop3s://%HOSTIP:%POP3SPORT/%TESTNUMBER
 </command>
 </client>

diff --git a/tests/data/test99 b/tests/data/test99
index 1ed74b0ba75ecc2ef230bb7a0eb5d1435ab3e142..db11a059b1fe050d04965087632db82823d18d85 100644 (file)
--- a/tests/data/test99
+++ b/tests/data/test99
@@ -40,10 +40,10 @@ large_file
 <server>
 http
 </server>
- <name>
+<name>
 HTTP GET with large-file resume point and failed resume
- </name>
- <command>
+</name>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 9999999999
 </command>
 </client>

diff --git a/tests/data/test990 b/tests/data/test990
index 1b22d1aa92eace2055854932c17e3c6a75041086..5ddb57f3ddc9dc29ef25dbdd7f50e2d6be7ad5a9 100644 (file)
--- a/tests/data/test990
+++ b/tests/data/test990
@@ -35,7 +35,7 @@ http
 <name>
 use -w %output{}
 </name>
- <command>
+<command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w '%output{%LOGDIR/output}%{http_code}\n'
 </command>
 </client>