From ee29dbdb8fc46d2d238b7c0aac135d2ad09c323e Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 30 Apr 2003 20:25:39 +0000
Subject: [PATCH] Each test case now specifies which server(s) it needs,
without relying on the test number.
---
tests/data/test1 | 3 +++
tests/data/test10 | 3 +++
tests/data/test100 | 3 +++
tests/data/test101 | 3 +++
tests/data/test102 | 3 +++
tests/data/test103 | 3 +++
tests/data/test104 | 3 +++
tests/data/test105 | 3 +++
tests/data/test106 | 3 +++
tests/data/test107 | 3 +++
tests/data/test108 | 3 +++
tests/data/test109 | 3 +++
tests/data/test11 | 3 +++
tests/data/test110 | 3 +++
tests/data/test111 | 3 +++
tests/data/test112 | 3 +++
tests/data/test113 | 3 +++
tests/data/test114 | 3 +++
tests/data/test115 | 3 +++
tests/data/test116 | 3 +++
tests/data/test117 | 3 +++
tests/data/test118 | 3 +++
tests/data/test119 | 3 +++
tests/data/test12 | 3 +++
tests/data/test120 | 3 +++
tests/data/test121 | 3 +++
tests/data/test122 | 3 +++
tests/data/test123 | 3 +++
tests/data/test124 | 3 +++
tests/data/test125 | 3 +++
tests/data/test126 | 3 +++
tests/data/test127 | 3 +++
tests/data/test128 | 3 +++
tests/data/test13 | 3 +++
tests/data/test130 | 3 +++
tests/data/test131 | 3 +++
tests/data/test132 | 3 +++
tests/data/test133 | 3 +++
tests/data/test134 | 3 +++
tests/data/test135 | 3 +++
tests/data/test136 | 3 +++
tests/data/test137 | 3 +++
tests/data/test138 | 3 +++
tests/data/test139 | 3 +++
tests/data/test14 | 3 +++
tests/data/test140 | 3 +++
tests/data/test141 | 3 +++
tests/data/test142 | 3 +++
tests/data/test15 | 3 +++
tests/data/test16 | 3 +++
tests/data/test17 | 3 +++
tests/data/test18 | 3 +++
tests/data/test19 | 3 +++
tests/data/test190 | 3 +++
tests/data/test2 | 3 +++
tests/data/test20 | 3 +++
tests/data/test200 | 3 +++
tests/data/test201 | 3 +++
tests/data/test202 | 3 +++
tests/data/test21 | 3 +++
tests/data/test22 | 3 +++
tests/data/test23 | 3 +++
tests/data/test24 | 3 +++
tests/data/test25 | 3 +++
tests/data/test26 | 3 +++
tests/data/test27 | 3 +++
tests/data/test28 | 3 +++
tests/data/test29 | 3 +++
tests/data/test3 | 3 +++
tests/data/test30 | 3 +++
tests/data/test300 | 3 +++
tests/data/test301 | 3 +++
tests/data/test302 | 3 +++
tests/data/test303 | 3 +++
tests/data/test304 | 3 +++
tests/data/test305 | 3 +++
tests/data/test306 | 3 +++
tests/data/test31 | 3 +++
tests/data/test32 | 3 +++
tests/data/test33 | 3 +++
tests/data/test34 | 3 +++
tests/data/test36 | 3 +++
tests/data/test37 | 3 +++
tests/data/test38 | 3 +++
tests/data/test39 | 3 +++
tests/data/test4 | 3 +++
tests/data/test400 | 3 +++
tests/data/test401 | 3 +++
tests/data/test402 | 3 +++
tests/data/test403 | 3 +++
tests/data/test43 | 3 +++
tests/data/test44 | 3 +++
tests/data/test45 | 3 +++
tests/data/test46 | 3 +++
tests/data/test47 | 3 +++
tests/data/test48 | 3 +++
tests/data/test49 | 3 +++
tests/data/test5 | 3 +++
tests/data/test50 | 3 +++
tests/data/test51 | 3 +++
tests/data/test52 | 3 +++
tests/data/test53 | 3 +++
tests/data/test54 | 3 +++
tests/data/test55 | 3 +++
tests/data/test56 | 3 +++
tests/data/test57 | 3 +++
tests/data/test58 | 3 +++
tests/data/test59 | 3 +++
tests/data/test6 | 3 +++
tests/data/test60 | 3 +++
tests/data/test61 | 3 +++
tests/data/test7 | 3 +++
tests/data/test8 | 3 +++
tests/data/test9 | 3 +++
114 files changed, 342 insertions(+)
diff --git a/tests/data/test1 b/tests/data/test1
index 78815a3048..42d3ffbe3e 100644
--- a/tests/data/test1
+++ b/tests/data/test1
@@ -20,6 +20,9 @@ Funny-head: yesyes
#
# Client-side
<client>
+<server>
+http
+</server>
<name>
simple HTTP GET
</name>
diff --git a/tests/data/test10 b/tests/data/test10
index ef34e87121..3b8674943d 100644
--- a/tests/data/test10
+++ b/tests/data/test10
@@ -12,6 +12,9 @@ blablabla
# Client-side
<client>
+<server>
+http
+</server>
<name>
simple HTTP PUT from file
</name>
diff --git a/tests/data/test100 b/tests/data/test100
index c5ccce786e..8fbb1714e9 100644
--- a/tests/data/test100
+++ b/tests/data/test100
@@ -19,6 +19,9 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
#
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP dir list PASV
</name>
diff --git a/tests/data/test101 b/tests/data/test101
index a191c4ba20..eabc6e2efc 100644
--- a/tests/data/test101
+++ b/tests/data/test101
@@ -17,6 +17,9 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP dir list, PORT with specified IP
</name>
diff --git a/tests/data/test102 b/tests/data/test102
index 186732625b..a124581fd8 100644
--- a/tests/data/test102
+++ b/tests/data/test102
@@ -12,6 +12,9 @@ works
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP RETR PASV
</name>
diff --git a/tests/data/test103 b/tests/data/test103
index d362feaee7..e463913186 100644
--- a/tests/data/test103
+++ b/tests/data/test103
@@ -12,6 +12,9 @@ works
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP RETR PORT with CWD
</name>
diff --git a/tests/data/test104 b/tests/data/test104
index ef6b9fc5db..a37b84f5d2 100644
--- a/tests/data/test104
+++ b/tests/data/test104
@@ -7,6 +7,9 @@
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP --head to get file size only
</name>
diff --git a/tests/data/test105 b/tests/data/test105
index 3ae69d4e59..b077ecc750 100644
--- a/tests/data/test105
+++ b/tests/data/test105
@@ -12,6 +12,9 @@ works
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP user+password in URL and ASCII transfer
</name>
diff --git a/tests/data/test106 b/tests/data/test106
index 4f8a3b3171..4b18095f53 100644
--- a/tests/data/test106
+++ b/tests/data/test106
@@ -12,6 +12,9 @@ works
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP GET with type=A style ASCII URL using %20 codes
</name>
diff --git a/tests/data/test107 b/tests/data/test107
index ebbeefee98..bb69f16b79 100644
--- a/tests/data/test107
+++ b/tests/data/test107
@@ -1,6 +1,9 @@
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP PASV upload file
</name>
diff --git a/tests/data/test108 b/tests/data/test108
index eadc076f52..27c5c6d237 100644
--- a/tests/data/test108
+++ b/tests/data/test108
@@ -6,6 +6,9 @@
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP PORT upload with CWD
</name>
diff --git a/tests/data/test109 b/tests/data/test109
index a109c62c00..4aad721236 100644
--- a/tests/data/test109
+++ b/tests/data/test109
@@ -6,6 +6,9 @@
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP PASV upload append
</name>
diff --git a/tests/data/test11 b/tests/data/test11
index 9a9ccdd8a5..d06cb64f64 100644
--- a/tests/data/test11
+++ b/tests/data/test11
@@ -36,6 +36,9 @@ If this is received, the location following worked
# Client-side
<client>
+<server>
+http
+</server>
<name>
simple HTTP Location: following
</name>
diff --git a/tests/data/test110 b/tests/data/test110
index 310517468a..4014daa82c 100644
--- a/tests/data/test110
+++ b/tests/data/test110
@@ -11,6 +11,9 @@ but we emulate that
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP download resume with set limit
</name>
diff --git a/tests/data/test111 b/tests/data/test111
index 8e80ecb620..78b6141af0 100644
--- a/tests/data/test111
+++ b/tests/data/test111
@@ -7,6 +7,9 @@
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP download resume beyond file size
</name>
diff --git a/tests/data/test112 b/tests/data/test112
index b551522428..e519d67565 100644
--- a/tests/data/test112
+++ b/tests/data/test112
@@ -4,6 +4,9 @@
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP PASV upload resume
</name>
diff --git a/tests/data/test113 b/tests/data/test113
index 5dcc6afaf1..6357897b44 100644
--- a/tests/data/test113
+++ b/tests/data/test113
@@ -4,6 +4,9 @@
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP download, failed login: USER not valid
</name>
diff --git a/tests/data/test114 b/tests/data/test114
index 52f4378b21..0dfff77a06 100644
--- a/tests/data/test114
+++ b/tests/data/test114
@@ -4,6 +4,9 @@
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP download, failed login: PASS not valid
</name>
diff --git a/tests/data/test115 b/tests/data/test115
index 73ee731f21..204b0ccd98 100644
--- a/tests/data/test115
+++ b/tests/data/test115
@@ -4,6 +4,9 @@
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP download, failed PASV
</name>
diff --git a/tests/data/test116 b/tests/data/test116
index 618c26d008..0bc8620c8a 100644
--- a/tests/data/test116
+++ b/tests/data/test116
@@ -4,6 +4,9 @@
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP download, failed PORT
</name>
diff --git a/tests/data/test117 b/tests/data/test117
index edd5b7e09f..428cbee9da 100644
--- a/tests/data/test117
+++ b/tests/data/test117
@@ -4,6 +4,9 @@
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP download, failed TYPE
</name>
diff --git a/tests/data/test118 b/tests/data/test118
index ffd3e0130c..b97c0c9615 100644
--- a/tests/data/test118
+++ b/tests/data/test118
@@ -4,6 +4,9 @@
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP download, failed RETR
</name>
diff --git a/tests/data/test119 b/tests/data/test119
index 4aa681482c..2e53a82b2c 100644
--- a/tests/data/test119
+++ b/tests/data/test119
@@ -4,6 +4,9 @@
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP download, failed RETR with PORT
</name>
diff --git a/tests/data/test12 b/tests/data/test12
index 9f105f0cff..98dc39f559 100644
--- a/tests/data/test12
+++ b/tests/data/test12
@@ -20,6 +20,9 @@ ink="#ffffff" vlink="#cccccc">
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP range support
</name>
diff --git a/tests/data/test120 b/tests/data/test120
index bb97eff4a9..2fcf015390 100644
--- a/tests/data/test120
+++ b/tests/data/test120
@@ -12,6 +12,9 @@ works
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
ftp download with post-quote delete operation
</name>
diff --git a/tests/data/test121 b/tests/data/test121
index c94b6262f0..64d26f9e29 100644
--- a/tests/data/test121
+++ b/tests/data/test121
@@ -12,6 +12,9 @@ works
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
ftp download with post- and pre-transfer delete operations
</name>
diff --git a/tests/data/test122 b/tests/data/test122
index f1a481b1ba..3e385502aa 100644
--- a/tests/data/test122
+++ b/tests/data/test122
@@ -7,6 +7,9 @@
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP download resume with whole file already downloaded
</name>
diff --git a/tests/data/test123 b/tests/data/test123
index 218548aa70..066d709605 100644
--- a/tests/data/test123
+++ b/tests/data/test123
@@ -4,6 +4,9 @@
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP upload resume with whole file already downloaded
</name>
diff --git a/tests/data/test124 b/tests/data/test124
index 6ae97b7802..721f3271f3 100644
--- a/tests/data/test124
+++ b/tests/data/test124
@@ -7,6 +7,9 @@ we can still send data even if pwd fails!
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP download, failed PWD
</name>
diff --git a/tests/data/test125 b/tests/data/test125
index 6fa05add55..57f8e01057 100644
--- a/tests/data/test125
+++ b/tests/data/test125
@@ -4,6 +4,9 @@
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP download, failed CWD
</name>
diff --git a/tests/data/test126 b/tests/data/test126
index 060eefc507..1c32165230 100644
--- a/tests/data/test126
+++ b/tests/data/test126
@@ -7,6 +7,9 @@ this is file contents
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP download with multiple replies at once in RETR
</name>
diff --git a/tests/data/test127 b/tests/data/test127
index 34618308d0..aafe559d11 100644
--- a/tests/data/test127
+++ b/tests/data/test127
@@ -7,6 +7,9 @@ moooooooo
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP --disable-epsv
</name>
diff --git a/tests/data/test128 b/tests/data/test128
index bb09ec749c..a09631e0ca 100644
--- a/tests/data/test128
+++ b/tests/data/test128
@@ -4,6 +4,9 @@
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP upload with --crlf
</name>
diff --git a/tests/data/test13 b/tests/data/test13
index 5049946aad..251a12d181 100644
--- a/tests/data/test13
+++ b/tests/data/test13
@@ -11,6 +11,9 @@ blabla custom request result
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP custom request 'DELETE'
</name>
diff --git a/tests/data/test130 b/tests/data/test130
index 21a69c02bb..86a422564e 100644
--- a/tests/data/test130
+++ b/tests/data/test130
@@ -19,6 +19,9 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
#
# Client-side
<client requires=netrc_debug>
+<server>
+ftp
+</server>
<name>
FTP (optional .netrc; no user/pass) dir list PASV
</name>
diff --git a/tests/data/test131 b/tests/data/test131
index 9576ac8476..e1a8de78f2 100644
--- a/tests/data/test131
+++ b/tests/data/test131
@@ -19,6 +19,9 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
#
# Client-side
<client requires=netrc_debug>
+<server>
+ftp
+</server>
<name>
FTP (optional .netrc; user/no pass) dir list PASV
</name>
diff --git a/tests/data/test132 b/tests/data/test132
index 128de5a0e6..4d1f10b433 100644
--- a/tests/data/test132
+++ b/tests/data/test132
@@ -19,6 +19,9 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
#
# Client-side
<client requires=netrc_debug>
+<server>
+ftp
+</server>
<name>
FTP (optional .netrc; user/passwd supplied) dir list PASV
</name>
diff --git a/tests/data/test133 b/tests/data/test133
index f496e8f35f..d30a6d5a13 100644
--- a/tests/data/test133
+++ b/tests/data/test133
@@ -19,6 +19,9 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
#
# Client-side
<client requires=netrc_debug>
+<server>
+ftp
+</server>
<name>
FTP (compulsory .netrc; ignored user/passwd) dir list PASV
</name>
diff --git a/tests/data/test134 b/tests/data/test134
index 484946fe6f..258a4f3a93 100644
--- a/tests/data/test134
+++ b/tests/data/test134
@@ -19,6 +19,9 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
#
# Client-side
<client requires=netrc_debug>
+<server>
+ftp
+</server>
<name>
FTP (optional .netrc; programmatic user/passwd) dir list PASV
</name>
diff --git a/tests/data/test135 b/tests/data/test135
index ec39ecd0b7..5d63c2954c 100644
--- a/tests/data/test135
+++ b/tests/data/test135
@@ -16,6 +16,9 @@
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP retrieve a byte-range
</name>
diff --git a/tests/data/test136 b/tests/data/test136
index d17bb04333..3847f8f46f 100644
--- a/tests/data/test136
+++ b/tests/data/test136
@@ -7,6 +7,9 @@
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP with user and no password
</name>
diff --git a/tests/data/test137 b/tests/data/test137
index 3138f17736..65a7bc762c 100644
--- a/tests/data/test137
+++ b/tests/data/test137
@@ -7,6 +7,9 @@ this is file contents
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP download without size in RETR string
</name>
diff --git a/tests/data/test138 b/tests/data/test138
index 0d8bb90abd..af862e74ee 100644
--- a/tests/data/test138
+++ b/tests/data/test138
@@ -10,6 +10,9 @@ this is file contents
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP download without size in RETR string and no SIZE command
</name>
diff --git a/tests/data/test139 b/tests/data/test139
index dd87118f15..8d58a9b4ee 100644
--- a/tests/data/test139
+++ b/tests/data/test139
@@ -10,6 +10,9 @@ this is file contents
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP download a newer file with -z
</name>
diff --git a/tests/data/test14 b/tests/data/test14
index 795a9b4dbf..722383d796 100644
--- a/tests/data/test14
+++ b/tests/data/test14
@@ -10,6 +10,9 @@ Connection: close
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP HEAD with Connection: close
</name>
diff --git a/tests/data/test140 b/tests/data/test140
index eecec6029f..e0718e111a 100644
--- a/tests/data/test140
+++ b/tests/data/test140
@@ -9,6 +9,9 @@
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP download file with -z, expected to not transfer
</name>
diff --git a/tests/data/test141 b/tests/data/test141
index 6496095868..d12003a512 100644
--- a/tests/data/test141
+++ b/tests/data/test141
@@ -9,6 +9,9 @@
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP download info with -I
</name>
diff --git a/tests/data/test142 b/tests/data/test142
index 680e08a01a..b9470ab3fb 100644
--- a/tests/data/test142
+++ b/tests/data/test142
@@ -6,6 +6,9 @@
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP URL with too deep (100+) dir hierarchy
</name>
diff --git a/tests/data/test15 b/tests/data/test15
index 4a89537397..224c0d5aae 100644
--- a/tests/data/test15
+++ b/tests/data/test15
@@ -12,6 +12,9 @@ Repeated nonsense-headers
# Client-side
<client>
+<server>
+http
+</server>
<name>
--write-out test
</name>
diff --git a/tests/data/test16 b/tests/data/test16
index eadcedd832..c31cf1acd1 100644
--- a/tests/data/test16
+++ b/tests/data/test16
@@ -13,6 +13,9 @@ the content goes here
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP with proxy athorization
</name>
diff --git a/tests/data/test17 b/tests/data/test17
index ae799bd629..a3f30b2bd3 100644
--- a/tests/data/test17
+++ b/tests/data/test17
@@ -10,6 +10,9 @@ This is the proof it works
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP with config file on stdin
</name>
diff --git a/tests/data/test18 b/tests/data/test18
index 04fb5ad8c7..053909c947 100644
--- a/tests/data/test18
+++ b/tests/data/test18
@@ -22,6 +22,9 @@ hoo
# Client-side
<client>
+<server>
+http
+</server>
<name>
multiple requests using {} in URL
</name>
diff --git a/tests/data/test19 b/tests/data/test19
index 5e2b352c38..0313ec7de9 100644
--- a/tests/data/test19
+++ b/tests/data/test19
@@ -6,6 +6,9 @@
# Client-side
<client>
+<server>
+none
+</server>
<name>
attempt connect to non-listening socket
</name>
diff --git a/tests/data/test190 b/tests/data/test190
index 947fda9ad5..5c75b9f412 100644
--- a/tests/data/test190
+++ b/tests/data/test190
@@ -5,6 +5,9 @@ moooooooo
# Client-side
<client>
+<server>
+ftp
+</server>
<name>
FTP download with strict timeout and slow CWD
</name>
diff --git a/tests/data/test2 b/tests/data/test2
index d8c72d0742..e1357130c4 100644
--- a/tests/data/test2
+++ b/tests/data/test2
@@ -14,6 +14,9 @@ Funny-head: yesyes
#
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP GET with user and password
</name>
diff --git a/tests/data/test20 b/tests/data/test20
index 943596430b..0b47595d7f 100644
--- a/tests/data/test20
+++ b/tests/data/test20
@@ -6,6 +6,9 @@
# Client-side
<client>
+<server>
+http
+</server>
<name>
attempt connect to non-existing host name
</name>
diff --git a/tests/data/test200 b/tests/data/test200
index 709de52fe6..a8af499e30 100644
--- a/tests/data/test200
+++ b/tests/data/test200
@@ -11,6 +11,9 @@ moo
# Client-side
<client>
+<server>
+none
+</server>
<name>
basic file:// file
</name>
diff --git a/tests/data/test201 b/tests/data/test201
index f441be801a..3e6d937972 100644
--- a/tests/data/test201
+++ b/tests/data/test201
@@ -6,6 +6,9 @@
# Client-side
<client>
+<server>
+none
+</server>
<name>
missing file:// file
</name>
diff --git a/tests/data/test202 b/tests/data/test202
index 4a7fd313e8..ef679e07a0 100644
--- a/tests/data/test202
+++ b/tests/data/test202
@@ -6,6 +6,9 @@
# Client-side
<client>
+<server>
+none
+</server>
<name>
two file:// URLs to stdout
</name>
diff --git a/tests/data/test21 b/tests/data/test21
index 168731db6e..cbd22947fb 100644
--- a/tests/data/test21
+++ b/tests/data/test21
@@ -6,6 +6,9 @@
# Client-side
<client>
+<server>
+http
+</server>
<name>
use curl with multiple request methods
</name>
diff --git a/tests/data/test22 b/tests/data/test22
index 86e3da1003..686a6bb9da 100644
--- a/tests/data/test22
+++ b/tests/data/test22
@@ -10,6 +10,9 @@ This is the proof it works
# Client-side
<client>
+<server>
+http
+</server>
<name>
get HTTP with URL > 10000 bytes
</name>
diff --git a/tests/data/test23 b/tests/data/test23
index 1a30b303d4..dfd0967f89 100644
--- a/tests/data/test23
+++ b/tests/data/test23
@@ -6,6 +6,9 @@
# Client-side
<client>
+<server>
+http
+</server>
<name>
unsupported protocol:// URL
</name>
diff --git a/tests/data/test24 b/tests/data/test24
index 2b0167c390..74a012ff71 100644
--- a/tests/data/test24
+++ b/tests/data/test24
@@ -10,6 +10,9 @@ This silly page doesn't reaaaaaly exist so you should not get it.
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP GET fail silently on HTTP error return
</name>
diff --git a/tests/data/test25 b/tests/data/test25
index cdad6ee183..2ee484a21b 100644
--- a/tests/data/test25
+++ b/tests/data/test25
@@ -51,6 +51,9 @@ Connection: close
# Client-side
<client>
+<server>
+http
+</server>
<name>
looping HTTP Location: following with --max-redirs, no persistance
</name>
diff --git a/tests/data/test26 b/tests/data/test26
index 7e08efcc19..df42f20eb5 100644
--- a/tests/data/test26
+++ b/tests/data/test26
@@ -11,6 +11,9 @@ Connection: close
# Client-side
<client>
+<server>
+http
+</server>
<name>
specify more -o than URLs
</name>
diff --git a/tests/data/test27 b/tests/data/test27
index b5851c2406..c0aa6a5ec8 100644
--- a/tests/data/test27
+++ b/tests/data/test27
@@ -11,6 +11,9 @@ Set-Cookie: path=/; thewinneris=nowayyouwin;
# Client-side
<client>
+<server>
+http
+</server>
<name>
Get same cookie page several times
</name>
diff --git a/tests/data/test28 b/tests/data/test28
index 57349e138f..d59949fa6f 100644
--- a/tests/data/test28
+++ b/tests/data/test28
@@ -36,6 +36,9 @@ If this is received, the location following worked
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP Location: following with extra spaces in header
</name>
diff --git a/tests/data/test29 b/tests/data/test29
index 66ff5b9fca..465223f984 100644
--- a/tests/data/test29
+++ b/tests/data/test29
@@ -14,6 +14,9 @@ wait 10
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP with 2 secs timeout
</name>
diff --git a/tests/data/test3 b/tests/data/test3
index ac1bf51b9a..e6bb28f22c 100644
--- a/tests/data/test3
+++ b/tests/data/test3
@@ -14,6 +14,9 @@ this is data even though Content-Length is set to zero
#
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP POST with user and password
</name>
diff --git a/tests/data/test30 b/tests/data/test30
index 8a5de32b64..16b3ad124c 100644
--- a/tests/data/test30
+++ b/tests/data/test30
@@ -6,6 +6,9 @@
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP with no data in server reply
</name>
diff --git a/tests/data/test300 b/tests/data/test300
index 7daf261e9f..4840f63ff1 100644
--- a/tests/data/test300
+++ b/tests/data/test300
@@ -14,6 +14,9 @@ MooMoo
#
# Client-side
<client>
+<server>
+https
+</server>
<name>
simple HTTPS GET
</name>
diff --git a/tests/data/test301 b/tests/data/test301
index 88ee14b3b7..9226a476b5 100644
--- a/tests/data/test301
+++ b/tests/data/test301
@@ -14,6 +14,9 @@ Funny-head: yesyes
#
# Client-side
<client>
+<server>
+https
+</server>
<name>
HTTPS GET with user and password
</name>
diff --git a/tests/data/test302 b/tests/data/test302
index 61202bf781..70f5791d44 100644
--- a/tests/data/test302
+++ b/tests/data/test302
@@ -7,6 +7,9 @@ MOOOOO
#
# Client-side
<client>
+<server>
+https
+</server>
<name>
HTTPS GET over HTTP proxy fails
</name>
diff --git a/tests/data/test303 b/tests/data/test303
index 1b2253d410..d7a55a7804 100644
--- a/tests/data/test303
+++ b/tests/data/test303
@@ -14,6 +14,9 @@ wait 10
# Client-side
<client>
+<server>
+https
+</server>
<name>
HTTPS with 2 secs timeout
</name>
diff --git a/tests/data/test304 b/tests/data/test304
index 69f654ba2e..c715cd69e6 100644
--- a/tests/data/test304
+++ b/tests/data/test304
@@ -12,6 +12,9 @@ blablabla
# Client-side
<client>
+<server>
+https
+</server>
<name>
HTTPS multipart formpost
</name>
diff --git a/tests/data/test305 b/tests/data/test305
index 70432039f1..92d9d67d7b 100644
--- a/tests/data/test305
+++ b/tests/data/test305
@@ -6,6 +6,9 @@
# Client-side
<client>
+<server>
+https
+</server>
<name>
insecure HTTPS without permission
</name>
diff --git a/tests/data/test306 b/tests/data/test306
index bb07b524d5..1704d7c93b 100644
--- a/tests/data/test306
+++ b/tests/data/test306
@@ -27,6 +27,9 @@ verify
#
# Client-side
<client>
+<server>
+https
+</server>
<name>
HTTPS GET, receive no headers only data!
</name>
diff --git a/tests/data/test31 b/tests/data/test31
index 8ff61a0dfa..f4bb622151 100644
--- a/tests/data/test31
+++ b/tests/data/test31
@@ -23,6 +23,9 @@ boo
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP with weirdly formatted cookies and cookiejar storage
</name>
diff --git a/tests/data/test32 b/tests/data/test32
index 69573945b3..176639a71c 100644
--- a/tests/data/test32
+++ b/tests/data/test32
@@ -20,6 +20,9 @@ Funny-head: yesyes
#
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP with -d and -G
</name>
diff --git a/tests/data/test33 b/tests/data/test33
index f255bc4e0e..3b94f044e7 100644
--- a/tests/data/test33
+++ b/tests/data/test33
@@ -7,6 +7,9 @@
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP PUT with resume
</name>
diff --git a/tests/data/test34 b/tests/data/test34
index ea7d239b24..f8a526d4d3 100644
--- a/tests/data/test34
+++ b/tests/data/test34
@@ -30,6 +30,9 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbb
#
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP GET with chunked Transfer-Encoding
</name>
diff --git a/tests/data/test36 b/tests/data/test36
index 75b05ccee8..effaeb73a4 100644
--- a/tests/data/test36
+++ b/tests/data/test36
@@ -26,6 +26,9 @@ a
#
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP GET with bad chunked Transfer-Encoding
</name>
diff --git a/tests/data/test37 b/tests/data/test37
index 18df0c7069..d184b5684e 100644
--- a/tests/data/test37
+++ b/tests/data/test37
@@ -8,6 +8,9 @@
#
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP GET with nothing returned from server
</name>
diff --git a/tests/data/test38 b/tests/data/test38
index dca54e36d4..3279816178 100644
--- a/tests/data/test38
+++ b/tests/data/test38
@@ -12,6 +12,9 @@ todelooooo lalalala yada yada, we know nothing about ranges ;-)
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP resume request without server supporting it
</name>
diff --git a/tests/data/test39 b/tests/data/test39
index e4f7f3cf73..6ef41078e2 100644
--- a/tests/data/test39
+++ b/tests/data/test39
@@ -12,6 +12,9 @@ blablabla
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP RFC1867-type formposting with filename= and type=
</name>
diff --git a/tests/data/test4 b/tests/data/test4
index 9ca90c9a11..cf2a64a5c9 100644
--- a/tests/data/test4
+++ b/tests/data/test4
@@ -14,6 +14,9 @@ Funny-head: yesyes
#
# Client-side
<client>
+<server>
+http
+</server>
<name>
Replaced internal and added custom HTTP headers
</name>
diff --git a/tests/data/test400 b/tests/data/test400
index c8b361992e..47f5f288b9 100644
--- a/tests/data/test400
+++ b/tests/data/test400
@@ -19,6 +19,9 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
#
# Client-side
<client>
+<server>
+ftps
+</server>
<name>
FTPS dir list PASV
</name>
diff --git a/tests/data/test401 b/tests/data/test401
index a733eb2b31..12a72746f4 100644
--- a/tests/data/test401
+++ b/tests/data/test401
@@ -5,6 +5,9 @@ moooooooo
# Client-side
<client>
+<server>
+ftps
+</server>
<name>
FTPS download with strict timeout and slow CWD
</name>
diff --git a/tests/data/test402 b/tests/data/test402
index f9622c6dd2..96fbcec42b 100644
--- a/tests/data/test402
+++ b/tests/data/test402
@@ -5,6 +5,9 @@ moooooooo
# Client-side
<client>
+<server>
+ftps
+</server>
<killserver>
ftp
</killserver>
diff --git a/tests/data/test403 b/tests/data/test403
index 4c04366a52..8092fd0c65 100644
--- a/tests/data/test403
+++ b/tests/data/test403
@@ -8,6 +8,9 @@
#
# Client-side
<client>
+<server>
+ftps
+</server>
<name>
insecure FTPS without permission
</name>
diff --git a/tests/data/test43 b/tests/data/test43
index a3fba868ae..adef3bdd13 100644
--- a/tests/data/test43
+++ b/tests/data/test43
@@ -36,6 +36,9 @@ If this is received, the location following worked
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP Location: following over HTTP proxy
</name>
diff --git a/tests/data/test44 b/tests/data/test44
index 14fa41b8c0..0460df5f30 100644
--- a/tests/data/test44
+++ b/tests/data/test44
@@ -12,6 +12,9 @@ blablabla
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP RFC1867-type formposting without Expect: header
</name>
diff --git a/tests/data/test45 b/tests/data/test45
index 06eda2ff4a..9897007ea8 100644
--- a/tests/data/test45
+++ b/tests/data/test45
@@ -36,6 +36,9 @@ If this is received, the location following worked
# Client-side
<client>
+<server>
+http
+</server>
<name>
simple HTTP Location: without protocol in initial URL
</name>
diff --git a/tests/data/test46 b/tests/data/test46
index aa4691d4f0..b4ff3e6b60 100644
--- a/tests/data/test46
+++ b/tests/data/test46
@@ -17,6 +17,9 @@ This server reply is for testing a simple Location: following
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP, get cookies and store in cookie jar
</name>
diff --git a/tests/data/test47 b/tests/data/test47
index f6831b7802..2a33593724 100644
--- a/tests/data/test47
+++ b/tests/data/test47
@@ -13,6 +13,9 @@ Server: test-server/fake
#
# Client-side
<client>
+<server>
+http
+</server>
<name>
simple HTTP 1.0 GET
</name>
diff --git a/tests/data/test48 b/tests/data/test48
index 66a0c2a072..36aee249aa 100644
--- a/tests/data/test48
+++ b/tests/data/test48
@@ -12,6 +12,9 @@ Connection: close
#
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP with -d and -G and -I
</name>
diff --git a/tests/data/test49 b/tests/data/test49
index 8c31ed4b4d..b9c3419fba 100644
--- a/tests/data/test49
+++ b/tests/data/test49
@@ -34,6 +34,9 @@ body
#
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP follow redirect with ../
</name>
diff --git a/tests/data/test5 b/tests/data/test5
index 8ced1d739e..c04c66a82f 100644
--- a/tests/data/test5
+++ b/tests/data/test5
@@ -14,6 +14,9 @@ Funny-head: yesyes
#
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP over proxy
</name>
diff --git a/tests/data/test50 b/tests/data/test50
index 8b304265cf..38b274b922 100644
--- a/tests/data/test50
+++ b/tests/data/test50
@@ -34,6 +34,9 @@ body
#
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP follow redirect with ../../
</name>
diff --git a/tests/data/test51 b/tests/data/test51
index b2271e846e..717a5e016e 100644
--- a/tests/data/test51
+++ b/tests/data/test51
@@ -34,6 +34,9 @@ body
#
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP follow redirect with exessive ../
</name>
diff --git a/tests/data/test52 b/tests/data/test52
index ddaa2d7252..c9ec09e7f2 100644
--- a/tests/data/test52
+++ b/tests/data/test52
@@ -34,6 +34,9 @@ body
#
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP follow redirect with ./-prefix
</name>
diff --git a/tests/data/test53 b/tests/data/test53
index 2975b31c8c..9ccac219ba 100644
--- a/tests/data/test53
+++ b/tests/data/test53
@@ -13,6 +13,9 @@ This server says moo
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP, junk session cookies
</name>
diff --git a/tests/data/test54 b/tests/data/test54
index 1cedf902d3..5582ee1e97 100644
--- a/tests/data/test54
+++ b/tests/data/test54
@@ -11,6 +11,9 @@ This server reply is for testing
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP with blank Location:
</name>
diff --git a/tests/data/test55 b/tests/data/test55
index c65d95327c..11e25ae0ad 100644
--- a/tests/data/test55
+++ b/tests/data/test55
@@ -28,6 +28,9 @@ body
</reply>
<client>
+<server>
+http
+</server>
<name>
HTTP follow redirect with single slash in path
</name>
diff --git a/tests/data/test56 b/tests/data/test56
index 7173f5f23a..889182a26f 100644
--- a/tests/data/test56
+++ b/tests/data/test56
@@ -10,6 +10,9 @@ This is the proof it works
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP POST with *HUGE* request and chunked transfer-encoding
</name>
diff --git a/tests/data/test57 b/tests/data/test57
index ce7bed5267..e091a39cbe 100644
--- a/tests/data/test57
+++ b/tests/data/test57
@@ -10,6 +10,9 @@ Content-Type: text/html; charset=ISO-8859-4
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP content-type with spaces in
</name>
diff --git a/tests/data/test58 b/tests/data/test58
index 7b38dde16c..b7f413d5b0 100644
--- a/tests/data/test58
+++ b/tests/data/test58
@@ -12,6 +12,9 @@ blablabla
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP PUT from file with weird letters
</name>
diff --git a/tests/data/test59 b/tests/data/test59
index 90a813c600..198e4828fc 100644
--- a/tests/data/test59
+++ b/tests/data/test59
@@ -13,6 +13,9 @@ hej
#
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP URL with slash but with "parameter"
</name>
diff --git a/tests/data/test6 b/tests/data/test6
index c1bf5b34d1..0e1c3c715a 100644
--- a/tests/data/test6
+++ b/tests/data/test6
@@ -12,6 +12,9 @@ Funny-head: yesyes
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP with simple cookie send
</name>
diff --git a/tests/data/test60 b/tests/data/test60
index 7ee2dfc877..623dbe1f00 100644
--- a/tests/data/test60
+++ b/tests/data/test60
@@ -12,6 +12,9 @@ blablabla
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP PUT from stdin with wrong content-length
</name>
diff --git a/tests/data/test61 b/tests/data/test61
index 0c25385e6b..49cc48448c 100644
--- a/tests/data/test61
+++ b/tests/data/test61
@@ -18,6 +18,9 @@ boo
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP with various cookies and custom Host:
</name>
diff --git a/tests/data/test7 b/tests/data/test7
index 80f7b560c6..5299529a5f 100644
--- a/tests/data/test7
+++ b/tests/data/test7
@@ -15,6 +15,9 @@ Set-Cookie: partmatch=present; domain=.0.0.1; path=/;
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP with cookie parser and header recording
</name>
diff --git a/tests/data/test8 b/tests/data/test8
index ec12248db7..5ee7fc857d 100644
--- a/tests/data/test8
+++ b/tests/data/test8
@@ -10,6 +10,9 @@ Server: test-server/fake
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP with cookie parsing from header file
</name>
diff --git a/tests/data/test9 b/tests/data/test9
index ec5b3d35b9..3eb6f48785 100644
--- a/tests/data/test9
+++ b/tests/data/test9
@@ -12,6 +12,9 @@ blablabla
# Client-side
<client>
+<server>
+http
+</server>
<name>
HTTP RFC1867-type formposting
</name>
--
GitLab