tests: use proxy feature

This makes the tests succeed when using --disable-proxy.

Closes https://github.com/curl/curl/pull/4488

diff --git a/tests/data/test1002 b/tests/data/test1002
index c20995d90b31681b0ff263a5569e52c32f0ca333..5b6ef9431575de9cc079983a40c17a758d791e41 100644 (file)
--- a/tests/data/test1002
+++ b/tests/data/test1002
@@ -65,6 +65,7 @@ http
 <features>
 !SSPI
 crypto
+proxy
 </features>
  <name>
 HTTP PUT with Digest auth, resumed upload and modified method, twice

diff --git a/tests/data/test1008 b/tests/data/test1008
index c123c5c0cccd4cc4dc570c471f0ffdd4a253e2f8..9fca722c891780031f1328b41f242be93a764d86 100644 (file)
--- a/tests/data/test1008
+++ b/tests/data/test1008
@@ -88,6 +88,7 @@ http
 NTLM
 !SSPI
 debug
+proxy
 </features>
  <name>
 HTTP proxy CONNECT auth NTLM with chunked-encoded 407 response

diff --git a/tests/data/test1021 b/tests/data/test1021
index 800973d1cad8343d4bbe1fb15ea420ce0de4977b..689341d601d5db78aa56366ba5bd9da621833776 100644 (file)
--- a/tests/data/test1021
+++ b/tests/data/test1021
@@ -93,6 +93,7 @@ http
 NTLM
 !SSPI
 debug
+proxy
 </features>
  <name>
 HTTP proxy CONNECT with any proxyauth and proxy offers NTLM and close

diff --git a/tests/data/test1059 b/tests/data/test1059
index 6820ea6791eaef7d2177f50c2940222272e1f3a9..615e625c96b0ceb3aaf0de7fc67b93dfd40e8929 100644 (file)
--- a/tests/data/test1059
+++ b/tests/data/test1059
@@ -26,6 +26,7 @@ Content-Length: 0
 <client>
 <features>
 ftp
+proxy
 </features>
 <server>
 http

diff --git a/tests/data/test1060 b/tests/data/test1060
index 14fc7e53ce48ae2416f3f54de4148557e4afdd18..c4b264c108d4c9b5a86a9b5313623848f7fc8e3e 100644 (file)
--- a/tests/data/test1060
+++ b/tests/data/test1060
@@ -869,6 +869,7 @@ http
 <features>
 !SSPI
 crypto
+proxy
 </features>
  <name>
 HTTP proxy CONNECT auth Digest, large headers and data

diff --git a/tests/data/test1061 b/tests/data/test1061
index c481d39c4bb09d6dc03c43383d1e37fbfed3371a..6ddddfee2e8bf64ef9167be44e2cb751c3ebf65c 100644 (file)
--- a/tests/data/test1061
+++ b/tests/data/test1061
@@ -874,6 +874,7 @@ http
 <features>
 !SSPI
 crypto
+proxy
 </features>
  <name>
 HTTP proxy CONNECT auth Digest, large headers and chunked data

diff --git a/tests/data/test1077 b/tests/data/test1077
index a3c90245a7438b30e153badf5b16e76067c47ced..e917e8a56cf66789adcc348cd9da5ee62baba757 100644 (file)
--- a/tests/data/test1077
+++ b/tests/data/test1077
@@ -44,6 +44,7 @@ http
 </server>
 <features>
 ftp
+proxy
 </features>
  <name>
 FTP over HTTP proxy with downgrade to HTTP 1.0

diff --git a/tests/data/test1078 b/tests/data/test1078
index a9bb771be7110cbb591c09e0988b27792736affb..d705dbca4dd1d5208a866cb46578b94974e6a8cf 100644 (file)
--- a/tests/data/test1078
+++ b/tests/data/test1078
@@ -45,6 +45,9 @@ HTTP 1.0 CONNECT with proxytunnel and downgrade GET to HTTP/1.0
  <command>
 --proxy1.0 %HOSTIP:%PROXYPORT -p http://%HOSTIP.1078:%HTTPPORT/we/want/that/page/1078 http://%HOSTIP.1078:%HTTPPORT/we/want/that/page/1078
 </command>
+<features>
+proxy
+</features>
 </client>
 
 #

diff --git a/tests/data/test1087 b/tests/data/test1087
index d228976ac97b241ff79e6ccc9e1110f0f2801e96..883d9864243ac18b988e7a694d3c21215ed55791 100644 (file)
--- a/tests/data/test1087
+++ b/tests/data/test1087
@@ -80,6 +80,9 @@ HTTP, proxy with --anyauth and Location: to new host
  <command>
 http://first.host.it.is/we/want/that/page/10871000 -x %HOSTIP:%HTTPPORT --user iam:myself --location --anyauth
 </command>
+<features>
+proxy
+</features>
 </client>
 
 #

diff --git a/tests/data/test1088 b/tests/data/test1088
index a807ce9e50168a3ef9c19a6b34dfbbb10b3b6cc2..f2b6fc263246b6494699e29dd69591d299b6945a 100644 (file)
--- a/tests/data/test1088
+++ b/tests/data/test1088
@@ -81,6 +81,9 @@ HTTP, proxy with --anyauth and Location: to new host using location-trusted
  <command>
 http://first.host.it.is/we/want/that/page/10881000 -x %HOSTIP:%HTTPPORT --user iam:myself --location-trusted --anyauth
 </command>
+<features>
+proxy
+</features>
 </client>
 
 #

diff --git a/tests/data/test1092 b/tests/data/test1092
index adef4320b8fcb40cd4677efa1bffca19b7f96c6b..725a274ba22636ed68b0c6e3457e39a307b172cd 100644 (file)
--- a/tests/data/test1092
+++ b/tests/data/test1092
@@ -30,6 +30,7 @@ http
 </server>
 <features>
 ftp
+proxy
 </features>
  <name>
 FTP with type=i over HTTP proxy

diff --git a/tests/data/test1098 b/tests/data/test1098
index 9805648102a09bc6b07830df9d746b48552bebfd..0d397340c82b5729071cb73d0c00a00105bc8248 100644 (file)
--- a/tests/data/test1098
+++ b/tests/data/test1098
@@ -29,6 +29,7 @@ http
 <features>
 http
 ftp
+proxy
 </features>
  <name>
 FTP RETR twice over proxy confirming persistent connection

diff --git a/tests/data/test1104 b/tests/data/test1104
index 570f13c51c43ccdcabdcd0e183d2d0984f61b881..e66da58add16a513badac40df1e1f981235aef00 100644 (file)
--- a/tests/data/test1104
+++ b/tests/data/test1104
@@ -61,6 +61,9 @@ HTTP cookie expiry date at Jan 1 00:00:00 GMT 1970
  <command>
 http://%HOSTIP:%HTTPPORT/want/1104 -L -x %HOSTIP:%HTTPPORT -c log/cookies1104.jar
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test1106 b/tests/data/test1106
index 0c6bec1773bbb47dd3fb5023146b917d650a4a11..37a77e36e1c09128b02dfc223ee5d4194fbc94f0 100644 (file)
--- a/tests/data/test1106
+++ b/tests/data/test1106
@@ -24,6 +24,7 @@ hello
 <client>
 <features>
 ftp
+proxy
 </features>
 <server>
 http

diff --git a/tests/data/test1136 b/tests/data/test1136
index e18a9232561b617e96f91d5c0501bc5fd98e09c5..75b6ee838f777766b09b975410aa2b0403bb1760 100644 (file)
--- a/tests/data/test1136
+++ b/tests/data/test1136
@@ -33,6 +33,7 @@ boo
 <client>
 <features>
 PSL
+proxy
 </features>
 <server>
 http

diff --git a/tests/data/test1141 b/tests/data/test1141
index 9c41d3935aef4bd96557f61c125a56c2bac9b56f..b0cff8e3712af19d8dfdd80fba5cc134a7fac5a6 100644 (file)
--- a/tests/data/test1141
+++ b/tests/data/test1141
@@ -47,6 +47,9 @@ HTTP redirect to http:/// (three slashes!)
  <command>
 %HOSTIP:%HTTPPORT/want/1141 -L -x http://%HOSTIP:%HTTPPORT
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test1142 b/tests/data/test1142
index 76c6bdf55c5e84978ecd2833151908990069f7b3..5f1e2b35ad33db7ca31dd288a847288ba379ff9d 100644 (file)
--- a/tests/data/test1142
+++ b/tests/data/test1142
@@ -42,6 +42,9 @@ HTTP redirect to http://// (four slashes!)
  <command>
 %HOSTIP:%HTTPPORT/want/1142 -L -x http://%HOSTIP:%HTTPPORT
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test1150 b/tests/data/test1150
index ecd95d57eacb0940cbfd9fa270e2813a392ce095..e86c7e15494b33533ef1323adafd67f4b37eac8c 100644 (file)
--- a/tests/data/test1150
+++ b/tests/data/test1150
@@ -32,6 +32,9 @@ HTTP proxy with URLs using different ports
  <command>
 --proxy http://%HOSTIP:%HTTPPORT http://test.remote.example.com.1150:150/path http://test.remote.example.com.1150:1234/path/
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test1213 b/tests/data/test1213
index 4f22f0d92dc539761574c1ef6159d436a47c948b..46a6938cb3554ca5f24bf7868224a7182a2cf4f6 100644 (file)
--- a/tests/data/test1213
+++ b/tests/data/test1213
@@ -35,6 +35,9 @@ HTTP with proxy and host-only URL
  <command>
 -x %HOSTIP:%HTTPPORT we.want.that.site.com.1213
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test1214 b/tests/data/test1214
index 3eeb3e3ad3d06a395a15281c63be6fb162c25512..73c799a4afce07883d2d54c2104d7ba88d2db9bd 100644 (file)
--- a/tests/data/test1214
+++ b/tests/data/test1214
@@ -35,6 +35,9 @@ HTTP with proxy and URL with ? and no slash separator
  <command>
 -x %HOSTIP:%HTTPPORT http://we.want.that.site.com.1214?moo=foo
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test1215 b/tests/data/test1215
index 08d74369e62aad0461c50e4e360ddeca069f9adc..8edfd9b4e2c8959b7f8756e17fe638686ca6b29f 100644 (file)
--- a/tests/data/test1215
+++ b/tests/data/test1215
@@ -60,6 +60,7 @@ Finally, this is the real page!
 NTLM
 !SSPI
 debug
+proxy
 </features>
 <server>
 http

diff --git a/tests/data/test1216 b/tests/data/test1216
index be0f5c77a9fd86c398d6168f09658162f22c18bb..c4f977b6040598c0daf6d15283c42fd2a3d5cc59 100644 (file)
--- a/tests/data/test1216
+++ b/tests/data/test1216
@@ -39,6 +39,9 @@ example.fake  FALSE   /b      FALSE   0               moo1    indeed
 example.fake   FALSE   /c      FALSE   2139150993      moo2    indeed
 example.fake   TRUE    /c      FALSE   2139150993      moo3    indeed
 </file>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test1218 b/tests/data/test1218
index e3f1f6d04c956b44bbe9c6241d2a8b194f75c04e..37c8f4ef0256e4fa30df25468cb0512c2ecf6b13 100644 (file)
--- a/tests/data/test1218
+++ b/tests/data/test1218
@@ -32,6 +32,9 @@ HTTP cookies and domains with same prefix
  <command>
 http://example.fake/c/1218 http://example.fake/c/1218 http://bexample.fake/c/1218 -b nonexisting -x %HOSTIP:%HTTPPORT
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test1228 b/tests/data/test1228
index a7e56a7975926de20a1981da5a9dd70de7e23b1c..50af6bc2c990b3c069c25b568e5e7ea1477d05ad 100644 (file)
--- a/tests/data/test1228
+++ b/tests/data/test1228
@@ -31,6 +31,9 @@ HTTP cookie path match
  <command>
 http://example.fake/hoge/1228 http://example.fake/hogege/ -b nonexisting -x %HOSTIP:%HTTPPORT
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test1230 b/tests/data/test1230
index ca2f6c67d690f6e0e2898ae2900e542aa2f560c0..860ce21a45c7bf7e0ab657abcc098f76ceb0088d 100644 (file)
--- a/tests/data/test1230
+++ b/tests/data/test1230
@@ -43,6 +43,7 @@ mooooooo
 <client>
 <features>
 ipv6
+proxy
 </features>
 <server>
 http-proxy

diff --git a/tests/data/test1232 b/tests/data/test1232
index d0659f1263393fe948c438429ca61c51a634fe46..7425d44d88ebbd77423759028559c23f11e75b60 100644 (file)
--- a/tests/data/test1232
+++ b/tests/data/test1232
@@ -41,6 +41,9 @@ HTTP URL with dotdot removal from path using an HTTP proxy
  <command>
 --proxy http://%HOSTIP:%HTTPPORT http://test.remote.haxx.se.1232:8990/../../hej/but/who/../1232?stupid=me/../1232#soo/../1232 http://test.remote.haxx.se.1232:8990/../../hej/but/who/../12320001#/../12320001
 </command>
+<features>
+proxy
+</features>
 </client>
 
 #

diff --git a/tests/data/test1241 b/tests/data/test1241
index aaa568868a88353545d44780e3adc4e74636ca53..bc6c61801a6fc5e4a04289597bedafe104925941 100644 (file)
--- a/tests/data/test1241
+++ b/tests/data/test1241
@@ -40,6 +40,9 @@ HTTP _without_ dotdot removal
  <command>
 --path-as-is --proxy http://%HOSTIP:%HTTPPORT http://test.remote.haxx.se.1241:8990/../../hej/but/who/../1241?stupid=me/../1241#soo/../1241 http://test.remote.haxx.se.1241:8990/../../hej/but/who/../12410001#/../12410001
 </command>
+<features>
+proxy
+</features>
 </client>
 
 #

diff --git a/tests/data/test1246 b/tests/data/test1246
index 65659292d395a09e119e61abd36d29908d6ea02e..a35bc89c37831a5f62b1c22f8c7398f967684f21 100644 (file)
--- a/tests/data/test1246
+++ b/tests/data/test1246
@@ -40,6 +40,9 @@ URL with '#' at end of host name instead of '/'
  <command>
 --proxy http://%HOSTIP:%HTTPPORT http://test.remote.haxx.se.1246:%HTTPPORT#@127.0.0.1/tricked.html no-scheme-url.com.1246:%HTTPPORT#@127.127.127.127/again.html
 </command>
+<features>
+proxy
+</features>
 </client>
 
 #

diff --git a/tests/data/test1253 b/tests/data/test1253
index 74002994b31edbf4b3339a92f00225ad1cb4ead3..8f240b0af304edf928c2b8e8cd9f25e4147afd42 100644 (file)
--- a/tests/data/test1253
+++ b/tests/data/test1253
@@ -35,6 +35,9 @@ NO_PROXY=example.com
 <command>
 http://somewhere.example.com/1253 --proxy http://%HOSTIP:%HTTPPORT --noproxy %HOSTIP
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test1254 b/tests/data/test1254
index 817b9342beb6961236a57c9f8bea48f993a79e49..c05975488c818273cb05932ccb9574b051dcbe7c 100644 (file)
--- a/tests/data/test1254
+++ b/tests/data/test1254
@@ -35,6 +35,9 @@ NO_PROXY=example.com
 <command>
 http://somewhere.example.com/1254 --proxy http://%HOSTIP:%HTTPPORT --noproxy ""
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test1256 b/tests/data/test1256
index 09c59f4ff00a72bde745e85b49d76c2fd00aaaeb..e86afbb53f60d2848676c95f17eaeb8c47250936 100644 (file)
--- a/tests/data/test1256
+++ b/tests/data/test1256
@@ -36,6 +36,9 @@ NO_PROXY=example.com
 <command>
 http://somewhere.example.com/1256 --noproxy %HOSTIP
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test1257 b/tests/data/test1257
index 6b7e937364d9832298437903356ff3b66814608d..16a7c1af603b9d9c6743d16bd2b49eb4fbd7a70e 100644 (file)
--- a/tests/data/test1257
+++ b/tests/data/test1257
@@ -36,6 +36,9 @@ NO_PROXY=example.com
 <command>
 http://somewhere.example.com/1257 --noproxy ""
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test1287 b/tests/data/test1287
index 46c2924972d44ee298b214ce2ec1c693885e7ff9..976fd6ecfe63ffdba9517dd05ec397eb3efde3dd 100644 (file)
--- a/tests/data/test1287
+++ b/tests/data/test1287
@@ -60,6 +60,9 @@ HTTP over proxy-tunnel ignore TE and CL in CONNECT 2xx responses
 <command>
 -v --proxytunnel -x %HOSTIP:%PROXYPORT http://test.1287:%HTTPPORT/we/want/that/page/1287
 </command>
+<features>
+proxy
+</features>
 </client>
 
 #

diff --git a/tests/data/test1288 b/tests/data/test1288
index 543aa3d6ece274636fc021102cb9d0d51138f218..d8a1e524cd2135248d7282687b1ab9bd23e13d16 100644 (file)
--- a/tests/data/test1288
+++ b/tests/data/test1288
@@ -44,6 +44,9 @@ Suppress proxy CONNECT response headers
 <command>
 --proxytunnel --suppress-connect-headers --dump-header - --include --write-out "\nCONNECT CODE: %{http_connect}\nRECEIVED HEADER BYTE TOTAL: %{size_header}\n" --proxy %HOSTIP:%PROXYPORT http://%HOSTIP.1288:%HTTPPORT/we/want/that/page/1288
 </command>
+<features>
+proxy
+</features>
 </client>
 
 #

diff --git a/tests/data/test1314 b/tests/data/test1314
index 078ada64adaea1f00925648acd1f5793ab4eb91d..3963bd93f4367de0d9ef594fc5d5312c94906b0c 100644 (file)
--- a/tests/data/test1314
+++ b/tests/data/test1314
@@ -56,6 +56,9 @@ HTTP Location: following a // prefixed url
  <command>
 http://firstplace.example.com/want/1314 -L -x http://%HOSTIP:%HTTPPORT
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test1319 b/tests/data/test1319
index f50c531650d383a4ab99c34a4050857e5dc25a6e..8fc968c890f583f16867df2c2d684536cc57a233 100644 (file)
--- a/tests/data/test1319
+++ b/tests/data/test1319
@@ -50,6 +50,7 @@ http-proxy
 </server>
 <features>
 http
+proxy
 </features>
  <name>
 POP3 fetch tunneled through HTTP proxy

diff --git a/tests/data/test1320 b/tests/data/test1320
index 7a15f8091af64445cec160ccd9a74d9e45725bd5..da4079e939c6d52603229d6a5f50b852a9a72136 100644 (file)
--- a/tests/data/test1320
+++ b/tests/data/test1320
@@ -27,6 +27,7 @@ http-proxy
 </server>
 <features>
 http
+proxy
 </features>
  <name>
 SMTP send tunneled through HTTP proxy

diff --git a/tests/data/test1321 b/tests/data/test1321
index 72a52c9357d109eb1745bf1a673fa1f8db0e01f6..cc9117774d88e71106fcdb22fadef72c0fe60ab4 100644 (file)
--- a/tests/data/test1321
+++ b/tests/data/test1321
@@ -46,6 +46,7 @@ http-proxy
 </server>
 <features>
 http
+proxy
 </features>
  <name>
 IMAP FETCH tunneled through HTTP proxy

diff --git a/tests/data/test1329 b/tests/data/test1329
index 3d2d0cb6c57ee8ab67446dfbdd359a41b13e7fb2..2cec0b895d0625dc586b369dc39b3d5e41f7d013 100644 (file)
--- a/tests/data/test1329
+++ b/tests/data/test1329
@@ -17,6 +17,9 @@ http
  <command>
 http://%HOSTIP:%HTTPPORT/we/want/that/page/1329 -x "/server"
 </command>
+<features>
+proxy
+</features>
 </client>
 
 #

diff --git a/tests/data/test1331 b/tests/data/test1331
index 6b5823529ed10297a3c3188c1936c65fb0d52f10..865abd9699a06183f2e741c196622fe3081541b8 100644 (file)
--- a/tests/data/test1331
+++ b/tests/data/test1331
@@ -64,6 +64,9 @@ HTTP --proxy-anyauth and 407 with cookies
  <command>
 -U myname:mypassword -x %HOSTIP:%HTTPPORT http://z.x.com/1331 --proxy-anyauth -c log/dump1331
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test1415 b/tests/data/test1415
index 91abedc3384a55ef2d65132555884f6c9e42c9e0..94ce02c59846a1db6bef9053fd58e21310e2a7c0 100644 (file)
--- a/tests/data/test1415
+++ b/tests/data/test1415
@@ -46,6 +46,9 @@ TZ=GMT
 <command>
 http://example.com/we/want/1415 -b none -c log/jar1415.txt -x %HOSTIP:%HTTPPORT
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test1421 b/tests/data/test1421
index 6c59b2160d572a0db3f7f0428792ff895124994b..dea49e781927d2f5b2be996db7150cccb130484e 100644 (file)
--- a/tests/data/test1421
+++ b/tests/data/test1421
@@ -35,6 +35,9 @@ Re-using HTTP proxy connection for two different host names
  <command>
 --proxy http://%HOSTIP:%HTTPPORT http://test.remote.haxx.se.1421:8990/ http://different.remote.haxx.se.1421:8990
 </command>
+<features>
+proxy
+</features>
 </client>
 
 #

diff --git a/tests/data/test1428 b/tests/data/test1428
index 59041ec9620f5e4df0fcd09a3845f713a0cba9bf..f09c02dd953d22f365762939927a7433bdc7bf7c 100644 (file)
--- a/tests/data/test1428
+++ b/tests/data/test1428
@@ -52,6 +52,9 @@ HTTP over proxy-tunnel with --proxy-header and --header
  <command>
 http://test.1428:%HTTPPORT/we/want/that/page/1428 -p -x %HOSTIP:%PROXYPORT --user 'iam:my:;self' --header "header-type: server" --proxy-header "header-type: proxy"
 </command>
+<features>
+proxy
+</features>
 </client>
 
 #

diff --git a/tests/data/test1447 b/tests/data/test1447
index e62cd72f24b550d5c22c828a8ac0d691bb2a76d4..d1182942eebecba876c6fb014c38bb4e91b70380 100644 (file)
--- a/tests/data/test1447
+++ b/tests/data/test1447
@@ -18,6 +18,7 @@ none
 </server>
 <features>
 http
+proxy
 </features>
  <name>
 Provide illegal proxy name 

diff --git a/tests/data/test1455 b/tests/data/test1455
index 2684d34e9f0177bd09a51c1929eb8d5bbafb5487..cbe6fe22e0157a3ae3f1137001abb328d2d89dda 100644 (file)
--- a/tests/data/test1455
+++ b/tests/data/test1455
@@ -39,6 +39,9 @@ HTTP GET when PROXY Protocol enabled
 <command>
 http://%HOSTIP:%HTTPPORT/1455 --haproxy-protocol
 </command>
+<features>
+proxy
+</features>
 </client>
 
 #

diff --git a/tests/data/test1456 b/tests/data/test1456
index 45244e604d3546195216cdd1d02458d287b85aca..27d63f5052278d14b4badfe4574dd956bf895922 100644 (file)
--- a/tests/data/test1456
+++ b/tests/data/test1456
@@ -42,6 +42,9 @@ HTTP-IPv6 GET with PROXY protocol
  <command>
 -g "http://%HOST6IP:%HTTP6PORT/1456" --local-port 44444 --haproxy-protocol
 </command>
+<features>
+proxy
+</features>
 </client>
 
 #

diff --git a/tests/data/test1509 b/tests/data/test1509
index b4bfc660309257389df48fbb57bba3ebaf898efb..faffc5d9e225935b608ac69025453cddbc19d1ab 100644 (file)
--- a/tests/data/test1509
+++ b/tests/data/test1509
@@ -53,7 +53,9 @@ http-proxy
 <tool>
 lib1509
 </tool>
-
+<features>
+proxy
+</features>
  <name>
 simple multi http:// through proxytunnel with authentication info
  </name>

diff --git a/tests/data/test1525 b/tests/data/test1525
index 595da5ea97bef90657dca6fcf6c0a7de09c93547..673e048c85cdbc8804c41ac166a062cefcead496 100644 (file)
--- a/tests/data/test1525
+++ b/tests/data/test1525
@@ -49,6 +49,9 @@ CURLOPT_PROXYHEADER is ignored CURLHEADER_UNIFIED
  <command>
  http://the.old.moo.1525:%HTTPPORT/1525 %HOSTIP:%PROXYPORT
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test1526 b/tests/data/test1526
index aa111c890e3f795be044975b4bff8dc67f0dbfb1..f6fb44dd551a4820e6e9c47cb639bab4e92ce5ba 100644 (file)
--- a/tests/data/test1526
+++ b/tests/data/test1526
@@ -51,6 +51,9 @@ CURLOPT_PROXYHEADER: separate host/proxy headers
  <command>
  http://the.old.moo.1526:%HTTPPORT/1526 %HOSTIP:%PROXYPORT
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test1527 b/tests/data/test1527
index e8d52794b9c3902a941efcb6f5411891dcee267c..6bb87d14a93e55dda43402999e6a2afe3bffd340 100644 (file)
--- a/tests/data/test1527
+++ b/tests/data/test1527
@@ -50,6 +50,9 @@ Check same headers are generated with CURLOPT_HEADEROPT == CURLHEADER_UNIFIED
  <command>
  http://the.old.moo.1527:%HTTPPORT/1527 %HOSTIP:%PROXYPORT
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test1528 b/tests/data/test1528
index 876806af4c012bead7cada915430e8e2dfba27a1..72c0a32d1e2d6541c8be30238f22e0baed1e67e9 100644 (file)
--- a/tests/data/test1528
+++ b/tests/data/test1528
@@ -43,6 +43,9 @@ Separately specified proxy/server headers sent in a proxy GET
  <command>
  http://the.old.moo:%HTTPPORT/1528 %HOSTIP:%PROXYPORT
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test1529 b/tests/data/test1529
index 33df2682463424d2c3e0ab87a7193a648ee069dc..f7be503676ea08dc677aa4a5a3c74cd68e1551a4 100644 (file)
--- a/tests/data/test1529
+++ b/tests/data/test1529
@@ -31,6 +31,9 @@ HTTP request-injection in URL sent over proxy
  <command>
  "http://the.old.moo:%HTTPPORT/1529" %HOSTIP:%PROXYPORT
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # it should be detected and an error should be reported

diff --git a/tests/data/test16 b/tests/data/test16
index 15f4c7a7b978531c8bd4c8a435031aa5d718e2fc..399aa942062c2a6aa23c38cd0d1beb2523d04ae6 100644 (file)
--- a/tests/data/test16
+++ b/tests/data/test16
@@ -33,6 +33,9 @@ HTTP with proxy authorization
  <command>
  -U fake@user:loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong -x %HOSTIP:%HTTPPORT http://we.want.that.site.com/16
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test162 b/tests/data/test162
index ee2f40aa7503e83746d465abdf1088a00ecba95a..099641a8709d32de3419323dc0011a691c62c38c 100644 (file)
--- a/tests/data/test162
+++ b/tests/data/test162
@@ -28,6 +28,7 @@ isn't because there's no Proxy-Authorization: NTLM header
 <features>
 NTLM
 !SSPI
+proxy
 </features>
 <server>
 http

diff --git a/tests/data/test165 b/tests/data/test165
index b9a1ed78690acec23d263d9fbb40961f6245c913..9009425aad43a95961fea03a46f79f31f2bb5a98 100644 (file)
--- a/tests/data/test165
+++ b/tests/data/test165
@@ -29,6 +29,7 @@ http
 </server>
 <features>
 idn
+proxy
 </features>
 <setenv>
 LC_ALL=

diff --git a/tests/data/test167 b/tests/data/test167
index 0b14996a33f0c412e41b583bd75d9cf9ef7207fd..e08555ecc3189052124303aa29dfb7e952262406 100644 (file)
--- a/tests/data/test167
+++ b/tests/data/test167
@@ -45,6 +45,7 @@ http
 <features>
 !SSPI
 crypto
+proxy
 </features>
  <name>
 HTTP with proxy-requiring-Basic to site-requiring-Digest

diff --git a/tests/data/test168 b/tests/data/test168
index 20e0b6d9c28e5027b5535e748bbd4c069420e509..fb87620448a219669a6f8df075b1b1d0d1d7a5fc 100644 (file)
--- a/tests/data/test168
+++ b/tests/data/test168
@@ -59,6 +59,7 @@ http
 <features>
 !SSPI
 crypto
+proxy
 </features>
  <name>
 HTTP with proxy-requiring-Digest to site-requiring-Digest

diff --git a/tests/data/test169 b/tests/data/test169
index bb089ca35d113a529b9dd68cbddd0a90a3b82506..8013bcc17f2c77512279cfde792a6c5cfb15307e 100644 (file)
--- a/tests/data/test169
+++ b/tests/data/test169
@@ -79,6 +79,7 @@ http
 NTLM
 !SSPI
 debug
+proxy
 </features>
  <name>
 HTTP with proxy-requiring-NTLM to site-requiring-Digest

diff --git a/tests/data/test170 b/tests/data/test170
index 8ce7774f94d43e592ca9a802f6463a41f5ce385e..49d595bbc453ee2044ba2d7924ec367975457692 100644 (file)
--- a/tests/data/test170
+++ b/tests/data/test170
@@ -20,6 +20,7 @@ http
 <features>
 NTLM
 !SSPI
+proxy
 </features>
  <name>
 HTTP POST with --proxy-ntlm and no SSL with no response

diff --git a/tests/data/test171 b/tests/data/test171
index 09e48b70af119b107abd2a5b5334363ff28fa044..482c0b7e238cdaf0cf5aada9c8577310522ce738 100644 (file)
--- a/tests/data/test171
+++ b/tests/data/test171
@@ -33,6 +33,9 @@ HTTP, get cookie with dot prefixed full domain
  <command>
 -c log/jar171 -x %HOSTIP:%HTTPPORT http://z.x.com/171
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test179 b/tests/data/test179
index f8f7811a7e7c1814f0c372aebf8d46a539b572f5..3a94c00bade3293bb914f554fa1b746a67f2c2b1 100644 (file)
--- a/tests/data/test179
+++ b/tests/data/test179
@@ -38,6 +38,9 @@ supertrooper.fake     FALSE   /a      FALSE   2139150993      mooo    indeed
 supertrooper.fake      FALSE   /b      FALSE   0               moo1    indeed
 supertrooper.fake      FALSE   /c      FALSE   2139150993      moo2    indeed
 </file>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test183 b/tests/data/test183
index f34dc0c98743e91126029265a87dc321aac0fed8..cf992a26fa21b5596b4170598598c3a5d4bf6e9c 100644 (file)
--- a/tests/data/test183
+++ b/tests/data/test183
@@ -30,6 +30,9 @@ HTTP GET two URLs over a single proxy with persistent connection
  <command>
 http://deathstar.another.galaxy/183 http://a.galaxy.far.far.away/183 --proxy http://%HOSTIP:%HTTPPORT
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test184 b/tests/data/test184
index 8b09dde28eee584a6626bcb26852ee4ac2361e6e..42e652e3bd55f1b0fe59b030476eb0eec404760c 100644 (file)
--- a/tests/data/test184
+++ b/tests/data/test184
@@ -50,6 +50,9 @@ HTTP replace Host: when following Location: to new host
  <command>
 http://deathstar.another.galaxy/184 -L -H "Host: another.visitor.stay.a.while.stay.foreeeeeever" --proxy http://%HOSTIP:%HTTPPORT
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test185 b/tests/data/test185
index 298dd49ced641bdc0189e3995fc63f0a4d1b0b0c..3bc58a041ac39c283e4970b14b34f3145028619b 100644 (file)
--- a/tests/data/test185
+++ b/tests/data/test185
@@ -50,6 +50,9 @@ HTTP replace Host: when following Location: on the same host
  <command>
 http://deathstar.another.galaxy/185 -L -H "Host: another.visitor.stay.a.while.stay.foreeeeeever" --proxy http://%HOSTIP:%HTTPPORT
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test1904 b/tests/data/test1904
index 08ad534a69e477b4369a19f88708e5828b606461..7602854728db40b9d677321b267388390b540ad0 100644 (file)
--- a/tests/data/test1904
+++ b/tests/data/test1904
@@ -53,6 +53,9 @@ HTTP CONNECT with 204 response
  <command>
 http://test.1904:%HTTPPORT/we/want/that/page/1904 -p --proxy %HOSTIP:%PROXYPORT
 </command>
+<features>
+proxy
+</features>
 </client>
 
 #

diff --git a/tests/data/test2050 b/tests/data/test2050
index 81ef79ffcc84042e668ad47130cab61a673751d7..5eef3dae2dd28264e9e9a0f43316a77fd6915ccd 100644 (file)
--- a/tests/data/test2050
+++ b/tests/data/test2050
@@ -53,6 +53,9 @@ Connect to specific host via HTTP proxy (switch to tunnel mode automatically)
  <command>
 http://www.example.com.2050/2050 --connect-to ::connect.example.com.2050:%HTTPPORT -x %HOSTIP:%PROXYPORT
 </command>
+<features>
+proxy
+</features>
 </client>
 
 #

diff --git a/tests/data/test2055 b/tests/data/test2055
index cca44942ffd2366111d9e67b3e783bb158f0f103..a5fac62be5b4a69f5355e386e460f6cea6bc87e5 100644 (file)
--- a/tests/data/test2055
+++ b/tests/data/test2055
@@ -51,7 +51,9 @@ socks5
  <name>
 Connect to specific host via SOCKS proxy and HTTP proxy (switch to tunnel mode automatically)
  </name>
-
+<features>
+proxy
+</features>
  <command>
 http://www.example.com.2055/2055 --connect-to ::connect.example.com.2055:%HTTPPORT -x %HOSTIP:%PROXYPORT --preproxy socks5://%HOSTIP:%SOCKSPORT
 </command>

diff --git a/tests/data/test2058 b/tests/data/test2058
index 0082503e0b757e423f42df1c65c74ae9fa023cd7..65a907f43a2619c72dd2bb62c39670d6244e2845 100644 (file)
--- a/tests/data/test2058
+++ b/tests/data/test2058
@@ -66,6 +66,7 @@ http
 <features>
 !SSPI
 crypto
+proxy
 </features>
  <name>
 HTTP POST --digest with PUT, resumed upload, modified method and SHA-256

diff --git a/tests/data/test2059 b/tests/data/test2059
index b74b0bdc1a0094bffdae1ed89f49a30aa965429b..4272a7b41a303c3f7733497032d05ff2f290a6a8 100644 (file)
--- a/tests/data/test2059
+++ b/tests/data/test2059
@@ -66,6 +66,7 @@ http
 <features>
 !SSPI
 crypto
+proxy
 </features>
  <name>
 HTTP POST --digest with PUT, resumed upload, modified method, SHA-512-256 and userhash=true

diff --git a/tests/data/test206 b/tests/data/test206
index 5f0c885625d24f632bd3fbb784ee9da313368b86..f99ac4c71e1e75b0e73dd16b3b59930357252e48 100644 (file)
--- a/tests/data/test206
+++ b/tests/data/test206
@@ -73,6 +73,7 @@ http
 <features>
 !SSPI
 crypto
+proxy
 </features>
  <name>
 HTTP proxy CONNECT auth Digest

diff --git a/tests/data/test2060 b/tests/data/test2060
index f323eb520a387669bb1458652ac53b2fc14b32c3..a0b291dc2157cb033201f54a55b5c9021b05a687 100644 (file)
--- a/tests/data/test2060
+++ b/tests/data/test2060
@@ -66,6 +66,7 @@ http
 <features>
 !SSPI
 crypto
+proxy
 </features>
  <name>
 HTTP POST --digest with PUT, resumed upload, modified method, SHA-512-256 and userhash=false

diff --git a/tests/data/test208 b/tests/data/test208
index afb2566b5e36b96c6447ac7dfb6dd74ecf44adb8..1c86558a8520d394b065f017356ed1748a0151f2 100644 (file)
--- a/tests/data/test208
+++ b/tests/data/test208
@@ -27,6 +27,7 @@ http
 </server>
 <features>
 ftp
+proxy
 </features>
  <name>
 HTTP PUT to a FTP URL with username+password - over HTTP proxy

diff --git a/tests/data/test209 b/tests/data/test209
index a0cc1a533d4368df792028ad38b2411fad036f91..aded6d2d2eea1b1bafb0200849fc8d3ea22ed405 100644 (file)
--- a/tests/data/test209
+++ b/tests/data/test209
@@ -79,6 +79,7 @@ http
 NTLM
 !SSPI
 debug
+proxy
 </features>
  <name>
 HTTP proxy CONNECT auth NTLM

diff --git a/tests/data/test213 b/tests/data/test213
index 819c8016d41e50b642c6073e0963a3e3d214e1f3..82d82c483e1582484751077bce3b326d91b264c2 100644 (file)
--- a/tests/data/test213
+++ b/tests/data/test213
@@ -79,6 +79,7 @@ http
 NTLM
 !SSPI
 debug
+proxy
 </features>
  <name>
 HTTP 1.0 proxy CONNECT auth NTLM and then POST

diff --git a/tests/data/test217 b/tests/data/test217
index f10df566b7b9fd02f395b38fe37e226d2010c81d..4ab51a2f3172cf51398d245be10aef6fdc987cd3 100644 (file)
--- a/tests/data/test217
+++ b/tests/data/test217
@@ -34,6 +34,9 @@ HTTP proxy CONNECT to proxy returning 405
  <command>
 http://test.remote.example.com.217:%HTTPPORT/path/2170002 --proxy http://%HOSTIP:%HTTPPORT --proxytunnel -w "%{http_code} %{http_connect}\n"
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test219 b/tests/data/test219
index be3f0f3c5e6b566fe2a706a0462f593a06af5a2c..49f17e43fd479b607432b4b003bb03d5a376986e 100644 (file)
--- a/tests/data/test219
+++ b/tests/data/test219
@@ -18,6 +18,7 @@ none
 </server>
 <features>
 http
+proxy
 </features>
  <name>
 try using proxy with unsupported scheme

diff --git a/tests/data/test233 b/tests/data/test233
index b631e52cf9c5b50ca65fedcac83f6cd8daa89ceb..a38d8c95e1e9469e758a7b62b74c342e4aa31485 100644 (file)
--- a/tests/data/test233
+++ b/tests/data/test233
@@ -67,6 +67,9 @@ HTTP, proxy, site+proxy auth and Location: to new host
  <command>
 http://first.host.it.is/we/want/that/page/233 -x %HOSTIP:%HTTPPORT --user iam:myself --proxy-user testing:this --location
 </command>
+<features>
+proxy
+</features>
 </client>
 
 #

diff --git a/tests/data/test234 b/tests/data/test234
index 1d2e05b39cd12914fba58007b60b30f0551a57f2..9e197cd1d3e35926779e55d1a0743db2c37889a4 100644 (file)
--- a/tests/data/test234
+++ b/tests/data/test234
@@ -69,6 +69,9 @@ HTTP, proxy, site+proxy auth and Location: to new host using location-trusted
  <command>
 http://first.host.it.is/we/want/that/page/234 -x %HOSTIP:%HTTPPORT --user iam:myself --proxy-user testing:this --location-trusted
 </command>
+<features>
+proxy
+</features>
 </client>
 
 #

diff --git a/tests/data/test239 b/tests/data/test239
index c9e5b6ac7f2e6b03000bc5b70f71b668d0cc143f..a6f1fd59bc32658f9144a0497bfad3ec3ebbdbcd 100644 (file)
--- a/tests/data/test239
+++ b/tests/data/test239
@@ -54,6 +54,7 @@ http
 NTLM
 !SSPI
 debug
+proxy
 </features>
  <name>
 HTTP proxy-auth NTLM and then POST

diff --git a/tests/data/test243 b/tests/data/test243
index 7d1ed7d6e5e59a1853b2609d72fea740fe3519b2..f83218e14689c3173a3c65e3954db2de78dda56e 100644 (file)
--- a/tests/data/test243
+++ b/tests/data/test243
@@ -75,6 +75,7 @@ http
 NTLM
 !SSPI
 debug
+proxy
 </features>
  <name>
 HTTP POST with --proxy-anyauth, picking NTLM

diff --git a/tests/data/test256 b/tests/data/test256
index 17ae807d14a0592eafdd9046d7c6609158a423bf..1567c629262080c9853dcc9f932f12d1aabd78f1 100644 (file)
--- a/tests/data/test256
+++ b/tests/data/test256
@@ -35,6 +35,9 @@ HTTP resume request over proxy with auth without server supporting it
 This text is here to simulate a partly downloaded file to resume
 download on.
 </file>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test257 b/tests/data/test257
index 502448ddbf5ee1bd1013fbc5c726956e1f152b1f..59a419bb17f8304e6d9e87563f330b652368b054 100644 (file)
--- a/tests/data/test257
+++ b/tests/data/test257
@@ -73,7 +73,9 @@ HTTP Location: following with --netrc-optional
  <command>
 http://supersite.com/want/257 -L -x http://%HOSTIP:%HTTPPORT --netrc-optional --netrc-file log/netrc257
 </command>
-
+<features>
+proxy
+</features>
 # netrc auth for two out of three sites:
 <file name="log/netrc257">
 machine supersite.com login user1 password passwd1

diff --git a/tests/data/test258 b/tests/data/test258
index 98c34014182e45d9fdf7bb873b2390b4e2145bcc..6c10564b871f3d12827de492237060ce13edcc00 100644 (file)
--- a/tests/data/test258
+++ b/tests/data/test258
@@ -58,6 +58,7 @@ http
 <features>
 !SSPI
 crypto
+proxy
 </features>
  <name>
 HTTP POST multipart without Expect: header using proxy anyauth (Digest)

diff --git a/tests/data/test259 b/tests/data/test259
index 6e185360164fb08d18f606f66a0235f6595b0cc9..58d25120fa500385a868302b2d9b2ff46fa3ca2e 100644 (file)
--- a/tests/data/test259
+++ b/tests/data/test259
@@ -54,6 +54,7 @@ http
 <features>
 !SSPI
 crypto
+proxy
 </features>
  <name>
 HTTP POST multipart with Expect: header using proxy anyauth (Digest)

diff --git a/tests/data/test263 b/tests/data/test263
index 5088141f5007142b165406796f7dc06d18e97507..e10c20741f64eb6f92b7427dde88637427cfe313 100644 (file)
--- a/tests/data/test263
+++ b/tests/data/test263
@@ -25,6 +25,7 @@ hello
 <client>
 <features>
 ipv6
+proxy
 </features>
 <server>
 http-ipv6

diff --git a/tests/data/test264 b/tests/data/test264
index f4d171a167870683f37cb5a44240be6b0772aa94..5aca0e6c5c267fcd8078a9b2b52f70911d730b34 100644 (file)
--- a/tests/data/test264
+++ b/tests/data/test264
@@ -30,6 +30,9 @@ HTTP with proxy string including http:// and user+password
  <command>
 http://we.want.that.site.com/264 -x http://f%61ke:user@%HOSTIP:%HTTPPORT
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test265 b/tests/data/test265
index 2e26ff5e509eef481e59c1b5df473346629b1432..ff7d5945e9c1a970fdc1ecb6a703dc0b8c10ef47 100644 (file)
--- a/tests/data/test265
+++ b/tests/data/test265
@@ -80,6 +80,7 @@ http
 NTLM
 !SSPI
 debug
+proxy
 </features>
  <name>
 HTTP proxy CONNECT auth NTLM and then POST, response-body in the 407

diff --git a/tests/data/test275 b/tests/data/test275
index 802c4bbccecf79a33fa4ea2abaae2370355c6c65..6065b4d811ba5b4b24b8aca67dc3a24fc1e06f6d 100644 (file)
--- a/tests/data/test275
+++ b/tests/data/test275
@@ -56,6 +56,9 @@ HTTP CONNECT with proxytunnel getting two URLs from the same host
  <command>
 http://remotesite.com.275:%HTTPPORT/we/want/that/page/275 -p -x %HOSTIP:%PROXYPORT --user iam:myself --proxy-user youare:yourself http://remotesite.com.275:%HTTPPORT/we/want/that/page/275
 </command>
+<features>
+proxy
+</features>
 </client>
 
 #

diff --git a/tests/data/test278 b/tests/data/test278
index 3112264a3f87039fea661d10088df549dc32cf9f..620f56b173a3127cc820be0ce769fbe651ecad30 100644 (file)
--- a/tests/data/test278
+++ b/tests/data/test278
@@ -30,6 +30,9 @@ HTTP with proxy string including http:// and user+empty password
  <command>
 http://we.want.that.site.com/278 -x http://f%61ke:@%HOSTIP:%HTTPPORT
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test279 b/tests/data/test279
index 47f8b687eb2a764a9b52b07e7b222a1ee2fd3f31..d5f4194f106062fa5ff967f4d1f0c11b21d06933 100644 (file)
--- a/tests/data/test279
+++ b/tests/data/test279
@@ -31,6 +31,9 @@ HTTP with proxy string including http:// and user only
  <command>
 http://we.want.that.site.com/279 -x http://f%61ke@%HOSTIP:%HTTPPORT
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test287 b/tests/data/test287
index 6772e220f587b8f97a1b895c072386736d3ad68c..7c29f7f024ed2e71826867741168fee0fa53c8e9 100644 (file)
--- a/tests/data/test287
+++ b/tests/data/test287
@@ -30,6 +30,9 @@ HTTP proxy CONNECT with custom User-Agent header
  <command>
 http://test.remote.example.com.287:%HTTPPORT/path/287 -H "User-Agent: looser/2015" --proxy http://%HOSTIP:%HTTPPORT --proxytunnel --proxy-header "User-Agent: looser/2007"
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test299 b/tests/data/test299
index 4daaea47d54700808fc566eaa17306c8e0a446a6..cfa743020f3e7070f46edb8fd2a5d28516ce691c 100644 (file)
--- a/tests/data/test299
+++ b/tests/data/test299
@@ -27,6 +27,7 @@ http
 </server>
 <features>
 ftp
+proxy
 </features>
  <name>
 FTP over HTTP proxy with user:pass not in url

diff --git a/tests/data/test317 b/tests/data/test317
index c6d8697be68fe53fe787e9c0292f151325bba52f..68a9b5c797d5fe0e84b551f0d1eb4a86df0cb1d1 100644 (file)
--- a/tests/data/test317
+++ b/tests/data/test317
@@ -67,6 +67,9 @@ HTTP with custom Authorization: and redirect to new host
  <command>
 http://first.host.it.is/we/want/that/page/317 -x %HOSTIP:%HTTPPORT -H "Authorization: s3cr3t" --proxy-user testing:this --location
 </command>
+<features>
+proxy
+</features>
 </client>
 
 #

diff --git a/tests/data/test318 b/tests/data/test318
index 838d1ba0f8b76fa844950a3c384173df655677d9..fd82c7aedb799f8339fc9ced1f6cdac322bb1f36 100644 (file)
--- a/tests/data/test318
+++ b/tests/data/test318
@@ -67,6 +67,9 @@ HTTP with custom Authorization: and redirect to new host
  <command>
 http://first.host.it.is/we/want/that/page/318 -x %HOSTIP:%HTTPPORT -H "Authorization: s3cr3t" --proxy-user testing:this --location-trusted
 </command>
+<features>
+proxy
+</features>
 </client>
 
 #

diff --git a/tests/data/test330 b/tests/data/test330
index 74607d5ee6e14e6539c873b44e2d9f92a1d74e2a..6cda172f66d96afadfde5151433e0258a1da1d21 100644 (file)
--- a/tests/data/test330
+++ b/tests/data/test330
@@ -65,6 +65,9 @@ HTTP with custom Cookie: and redirect to new host
  <command>
 http://first.host.it.is/we/want/that/page/317 -x %HOSTIP:%HTTPPORT -H "Cookie: test=yes" --location
 </command>
+<features>
+proxy
+</features>
 </client>
 
 #

diff --git a/tests/data/test331 b/tests/data/test331
index 54b86d2a18770f09308dfa4ecfc7f068e520a074..2ffac81f7161e6d5872a2679f355900b03f19aa1 100644 (file)
--- a/tests/data/test331
+++ b/tests/data/test331
@@ -41,6 +41,9 @@ HTTP with cookie using host name 'moo'
  <command>
 -x http://%HOSTIP:%HTTPPORT http://moo/we/want/331 -b none http://moo/we/want/3310002
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test335 b/tests/data/test335
index 4d54da980bd1909a574030b6eafeab6849e0847e..5817365e389bb78a69277f9b8e306f5fc0f8c860 100644 (file)
--- a/tests/data/test335
+++ b/tests/data/test335
@@ -61,6 +61,7 @@ http
 <features>
 !SSPI
 crypto
+proxy
 </features>
  <name>
 HTTP with proxy Digest and site Digest with creds in URLs

diff --git a/tests/data/test43 b/tests/data/test43
index e5535bb3af5225626e21a4fbf99d5a6f8e65a3c7..1960170137ffd62e1805de036edbac50cb4e4730 100644 (file)
--- a/tests/data/test43
+++ b/tests/data/test43
@@ -56,6 +56,9 @@ HTTP Location: following over HTTP proxy
  <command>
 http://%HOSTIP:%HTTPPORT/want/43 -L -x %HOSTIP:%HTTPPORT
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test5 b/tests/data/test5
index b62f1a127a6bfd2a426c7c04b8dab789d1e6e749..b98d27b3b04c7270ddf35c2c3d72753aa9a30d38 100644 (file)
--- a/tests/data/test5
+++ b/tests/data/test5
@@ -31,6 +31,9 @@ HTTP over proxy
  <command>
 http://%HOSTIP:%HTTPPORT/we/want/that/page/5#5 -x %HOSTIP:%HTTPPORT
 </command>
+<features>
+proxy
+</features>
 </client>
 
 #

diff --git a/tests/data/test503 b/tests/data/test503
index e8dc21e8dbbd888be45c512201fb456f60c8ad59..472149d2a00dcf5ec0ded394dd84d9127953470a 100644 (file)
--- a/tests/data/test503
+++ b/tests/data/test503
@@ -50,7 +50,9 @@ http-proxy
 <tool>
 lib503
 </tool>
-
+<features>
+proxy
+</features>
  <name>
 simple multi http:// through proxytunnel with authentication info
  </name>

diff --git a/tests/data/test504 b/tests/data/test504
index 2d3a3dd0d08d5707508536248a67c0dfb850ddb6..757faf1bd55ea72595fadcff9048cf34327b30c2 100644 (file)
--- a/tests/data/test504
+++ b/tests/data/test504
@@ -20,6 +20,7 @@ none
 </server>
 <features>
 http
+proxy
 </features>
 # tool is what to use instead of 'curl'
 <tool>

diff --git a/tests/data/test523 b/tests/data/test523
index 665211d48e0d3c6d31fadc2b76ad71b47c493762..c00a0969d4324ca049503f772e7c25e2f527bf5f 100644 (file)
--- a/tests/data/test523
+++ b/tests/data/test523
@@ -41,6 +41,9 @@ HTTP GET with proxy and CURLOPT_PORT
  <command>
 http://www.example.com:999/523 http://%HOSTIP:%HTTPPORT
 </command>
+<features>
+proxy
+</features>
 </client>
 
 #

diff --git a/tests/data/test540 b/tests/data/test540
index 8391cbe7880290f58509aa77f244f101d474845c..871c558fbadc8b8cd188e6ddd89f8d2847bdfa2f 100644 (file)
--- a/tests/data/test540
+++ b/tests/data/test540
@@ -67,6 +67,7 @@ lib540
 <features>
 !SSPI
 crypto
+proxy
 </features>
  <name>
 HTTP proxy auth Digest multi API re-using connection

diff --git a/tests/data/test547 b/tests/data/test547
index 5c4cfaaff4e49c24567e51d26ab4329219c2cc43..781799b11766aca637fce2f0c8e06fcf4eeb239c 100644 (file)
--- a/tests/data/test547
+++ b/tests/data/test547
@@ -78,6 +78,7 @@ lib547
 NTLM
 !SSPI
 debug
+proxy
 </features>
  <name>
 HTTP proxy auth NTLM with POST data from read callback

diff --git a/tests/data/test548 b/tests/data/test548
index 80b87d10ca2cc52ffac6124e2091ae5b34d9dab3..fa98cd437c782bd320bad1bc7c493936c541f138 100644 (file)
--- a/tests/data/test548
+++ b/tests/data/test548
@@ -78,6 +78,7 @@ lib548
 NTLM
 !SSPI
 debug
+proxy
 </features>
  <name>
 HTTP proxy auth NTLM with POST data from CURLOPT_POSTFIELDS

diff --git a/tests/data/test549 b/tests/data/test549
index a248edbf61cdda5e93eaef4508a7f002e3caf469..a9f1ca21c1e71caaee5097c1ffc1016b5bc1d72a 100644 (file)
--- a/tests/data/test549
+++ b/tests/data/test549
@@ -32,6 +32,7 @@ http
 </server>
 <features>
 ftp
+proxy
 </features>
 <tool>
 lib549

diff --git a/tests/data/test550 b/tests/data/test550
index a609aa216d126aab345d78c81706f36749346d56..1eff72a17b6d64e370aa725fc13567a5684f36c3 100644 (file)
--- a/tests/data/test550
+++ b/tests/data/test550
@@ -32,6 +32,7 @@ http
 </server>
 <features>
 ftp
+proxy
 </features>
 <tool>
 lib549

diff --git a/tests/data/test551 b/tests/data/test551
index ed6aee26431a3bddcbe34b56348afb53ac9d91a2..bb31a36f85eca10711471f33ec42801c9fa0a6f4 100644 (file)
--- a/tests/data/test551
+++ b/tests/data/test551
@@ -63,6 +63,7 @@ lib547
 <features>
 !SSPI
 crypto
+proxy
 </features>
  <name>
 HTTP proxy auth Digest with POST data from read callback

diff --git a/tests/data/test555 b/tests/data/test555
index f8b9298394df363be5eb322e04aa7bc9cd7be554..d4b946614801d551a80d443520928fc0579e553d 100644 (file)
--- a/tests/data/test555
+++ b/tests/data/test555
@@ -83,6 +83,7 @@ lib555
 NTLM
 !SSPI
 debug
+proxy
 </features>
  <name>
 HTTP proxy auth NTLM with POST data from read callback multi-if

diff --git a/tests/data/test561 b/tests/data/test561
index a6188eacfea2c256d087e8ce509a7d1a21257076..359e54cca1abbef3e78bcfcbfdfcc31df4d99d94 100644 (file)
--- a/tests/data/test561
+++ b/tests/data/test561
@@ -33,6 +33,7 @@ http
 </server>
 <features>
 ftp
+proxy
 </features>
 <tool>
 lib549

diff --git a/tests/data/test563 b/tests/data/test563
index c9df79219725d1344518901f5c616388c9d5f4c0..eb9372ed01b1fabf32a328290ab21862e4a2f28b 100644 (file)
--- a/tests/data/test563
+++ b/tests/data/test563
@@ -32,7 +32,9 @@ lib562
  <name>
 FTP type=A URL and CURLOPT_PORT set and proxy
  </name>
-
+<features>
+proxy
+</features>
 <setenv>
 ftp_proxy=http://%HOSTIP:%HTTPPORT/
 </setenv>

diff --git a/tests/data/test564 b/tests/data/test564
index 4c9ecd4664179e6aa8d0b434d91c3bf6986adb32..3078e2d083ee8882aeedabbee6c331ab13ae62ee 100644 (file)
--- a/tests/data/test564
+++ b/tests/data/test564
@@ -38,6 +38,9 @@ FTP RETR a file over a SOCKS proxy using the multi interface
 <command>
 ftp://%HOSTIP:%FTPPORT/path/564 %HOSTIP:%SOCKSPORT
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test590 b/tests/data/test590
index 7f30b83ef42ea193832c3d608d3ee8ca6b06645d..6f6250763ca6d7cd23b4f54dc864039952ecf263 100644 (file)
--- a/tests/data/test590
+++ b/tests/data/test590
@@ -76,6 +76,7 @@ lib590
 NTLM
 !SSPI
 debug
+proxy
 </features>
  <name>
 HTTP proxy offers Negotiate+NTLM, use only NTLM

diff --git a/tests/data/test63 b/tests/data/test63
index ccc19dd243aa3342e88206d59633f8683221c0a2..e7d7a4615c172702b594a703cfd90b2b3b07cf4f 100644 (file)
--- a/tests/data/test63
+++ b/tests/data/test63
@@ -33,6 +33,9 @@ http_proxy=http://fake:user@%HOSTIP:%HTTPPORT/
  <command>
 http://we.want.that.site.com/63
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test659 b/tests/data/test659
index 43e1aaf92ab08ccd81f89066f65246b04cf6d410..048c0d0f241bbc519e544a78a1603951fbb10080 100644 (file)
--- a/tests/data/test659
+++ b/tests/data/test659
@@ -36,6 +36,9 @@ CURLOPT_CURLU without the path set - over proxy
  <command>
 http://%HOSTIP:%HTTPPORT
 </command>
+<features>
+proxy
+</features>
 </client>
 
 <verify>

diff --git a/tests/data/test662 b/tests/data/test662
index 1923385011d56011a02117d558459c077e8bd228..53d97c39d6898cb4d38d1c160b33d10fda078fb0 100644 (file)
--- a/tests/data/test662
+++ b/tests/data/test662
@@ -51,6 +51,9 @@ HTTP redirect with whitespace in absolute Location: URL
  <command>
 http://example.com/please/gimme/662 -L -x http://%HOSTIP:%HTTPPORT
 </command>
+<features>
+proxy
+</features>
 </client>
 
 #

diff --git a/tests/data/test663 b/tests/data/test663
index b9648fd70650d296fa0169435fef3dfc4d314f31..6743b3258dc73bf37da0f131a711ad809747e784 100644 (file)
--- a/tests/data/test663
+++ b/tests/data/test663
@@ -55,6 +55,9 @@ HTTP redirect with dotdots and whitespaces in absolute Location: URL
  <command>
 http://example.com/please/../gimme/663?foobar#hello -L -x http://%HOSTIP:%HTTPPORT
 </command>
+<features>
+proxy
+</features>
 </client>
 
 #

diff --git a/tests/data/test704 b/tests/data/test704
index 6732d0a2063aea17f920249042e27683b732fb18..7f891fa9503b1e6a49c3faedbaffc7bf2632ecfc 100644 (file)
--- a/tests/data/test704
+++ b/tests/data/test704
@@ -25,6 +25,9 @@ Attempt connect to non-listening SOCKS4 proxy
  <command>
 --socks4 %HOSTIP:2 http://%HOSTIP:%HTTPPORT/704
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test705 b/tests/data/test705
index 3d5f04e3ac8bff925466ae186eee5d68bc019835..cfbf3419fba2194fd6e5f4eb3a9e9817fa316711 100644 (file)
--- a/tests/data/test705
+++ b/tests/data/test705
@@ -25,6 +25,9 @@ Attempt connect to non-listening SOCKS5 proxy
  <command>
 --socks5 %HOSTIP:2 http://%HOSTIP:%HTTPPORT/705
 </command>
+<features>
+proxy
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test714 b/tests/data/test714
index efec03227b5f9e1561dda150a133435b734e5552..776d8b29230df53c2409a0c4b69c600282e879b2 100644 (file)
--- a/tests/data/test714
+++ b/tests/data/test714
@@ -41,6 +41,7 @@ http-proxy
 </server>
 <features>
 http
+proxy
 </features>
  <name>
 FTP fetch with --proxy set to http:// and with --connect-to

diff --git a/tests/data/test715 b/tests/data/test715
index 56936b946cbffee35964dd0b0cb5b1cc6ed9aa14..85372ca24fb68efdc3f85a28d994540d515ac842 100644 (file)
--- a/tests/data/test715
+++ b/tests/data/test715
@@ -43,6 +43,7 @@ socks5
 </server>
 <features>
 http
+proxy
 </features>
  <name>
 FTP fetch with --preproxy, --proxy and --connect-to

diff --git a/tests/data/test716 b/tests/data/test716
index db61dcb3906fa464e5b89af72d86e21279c0f8ce..96167de5cfae2e9ddc17b0f3242b64090825eb2e 100644 (file)
--- a/tests/data/test716
+++ b/tests/data/test716
@@ -23,6 +23,7 @@ socks5
 </server>
 <features>
 http
+proxy
 </features>
 <name>
 SOCKS5 proxy with too long user name

diff --git a/tests/data/test717 b/tests/data/test717
index 35392443e0ea56b5b98a2656af9cc921ff0fc5bc..dae50d9f21acae7f888f754f51d0cc9cecd23818 100644 (file)
--- a/tests/data/test717
+++ b/tests/data/test717
@@ -47,6 +47,9 @@ SOCKS5 proxy auth
  <command>
 http://%HOSTIP:1/717 -x socks5://uz3r:p4ssworm@%HOSTIP:%SOCKSPORT
 </command>
+<features>
+proxy
+</features>
 </client>
 
 #

diff --git a/tests/data/test79 b/tests/data/test79
index b2566e229e289c6420dd0f82fe8d15ec8b27ae1a..9bc83668178e03ea48b519c158e1fd20bff6da30 100644 (file)
--- a/tests/data/test79
+++ b/tests/data/test79
@@ -29,6 +29,7 @@ http
 </server>
 <features>
 ftp
+proxy
 </features>
  <name>
 FTP over HTTP proxy

diff --git a/tests/data/test80 b/tests/data/test80
index 147a6aa12455b11c2f47a9cf7e516d1e1b2765ad..3e61eddde5aec44d86f1a06988594e4623d98b41 100644 (file)
--- a/tests/data/test80
+++ b/tests/data/test80
@@ -55,6 +55,9 @@ HTTP 1.0 CONNECT with proxytunnel and proxy+host Basic authentication
  <command>
 http://test.80:%HTTPPORT/we/want/that/page/80 -p --proxy1.0 %HOSTIP:%PROXYPORT --user iam:myself --proxy-user youare:yourself
 </command>
+<features>
+proxy
+</features>
 </client>
 
 #

diff --git a/tests/data/test81 b/tests/data/test81
index 499831bb39ace14200ae4c7617fb0c325a38a10a..4cc03975e5438a01c43574aa980a6cda139f609a 100644 (file)
--- a/tests/data/test81
+++ b/tests/data/test81
@@ -57,6 +57,7 @@ Finally, this is the real page!
 NTLM
 !SSPI
 debug
+proxy
 </features>
 <server>
 http

diff --git a/tests/data/test82 b/tests/data/test82
index 8b58f75da89bae4d6a0d07b7a112867906c468f6..88d5da84dc1d8b6d6bbfb0b0d5cd8b8d58dc67dd 100644 (file)
--- a/tests/data/test82
+++ b/tests/data/test82
@@ -26,6 +26,7 @@ This is not the real page either!
 # Client-side
 <client>
 <features>
+proxy
 </features>
 <server>
 http

diff --git a/tests/data/test83 b/tests/data/test83
index 120bcc6a1dd000302ed92f02d07e3e5674d432cc..400e0a0f3c5ba3cbcfd5bf96cf7e0fbe20b0341a 100644 (file)
--- a/tests/data/test83
+++ b/tests/data/test83
@@ -52,6 +52,9 @@ HTTP over proxy-tunnel with site authentication
  <command>
 http://test.83:%HTTPPORT/we/want/that/page/83 -p -x %HOSTIP:%PROXYPORT --user 'iam:my:;self'
 </command>
+<features>
+proxy
+</features>
 </client>
 
 #

diff --git a/tests/data/test84 b/tests/data/test84
index 629dae2fca858ff4ace05ae227cab5f7883ccfc2..4cfde6dbb70dcb7a7de2bfad0c960d8f529321ec 100644 (file)
--- a/tests/data/test84
+++ b/tests/data/test84
@@ -33,6 +33,9 @@ HTTP over proxy with site authentication
  <command>
 http://%HOSTIP:%HTTPPORT/we/want/that/page/84 -x %HOSTIP:%HTTPPORT --user iam:myself
 </command>
+<features>
+proxy
+</features>
 </client>
 
 #

diff --git a/tests/data/test85 b/tests/data/test85
index cb5e6e052ab11b0ece6b3b06f290bcde100923cd..8b4cd6abcc6ea91a19bbcf81bab196c3941a7c76 100644 (file)
--- a/tests/data/test85
+++ b/tests/data/test85
@@ -36,6 +36,9 @@ HTTP over proxy with site and proxy authentication
  <command>
 http://%HOSTIP:%HTTPPORT/we/want/that/page/85 -x %HOSTIP:%HTTPPORT --user iam:myself --proxy-user testing:this
 </command>
+<features>
+proxy
+</features>
 </client>
 
 #

diff --git a/tests/data/test93 b/tests/data/test93
index 138724835747aacdfd3cf43acaec075b490bf453..58e47bc6bc71002d0b999c3a2305225a403b0ef6 100644 (file)
--- a/tests/data/test93
+++ b/tests/data/test93
@@ -31,6 +31,9 @@ HTTP GET with failed proxy auth
  <command>
 http://%HOSTIP:%HTTPPORT/93 -x %HOSTIP:%HTTPPORT
 </command>
+<features>
+proxy
+</features>
 </client>
 
 #

diff --git a/tests/data/test94 b/tests/data/test94
index 2f3f4824df9bb01d3d3982a72bea9296a2099356..4ca53c63b820f3088b1b7df5f913dec9ca719f93 100644 (file)
--- a/tests/data/test94
+++ b/tests/data/test94
@@ -29,6 +29,7 @@ http
 </server>
 <features>
 SSL
+proxy
 </features>
  <name>
 HTTPS GET with failed proxy auth (CONNECT 1.0)

diff --git a/tests/data/test95 b/tests/data/test95
index 1cd88acab63c2a573227c3cff54688cd54e42c96..afc00aedece6dfa800be7308873edf08c10ce293 100644 (file)
--- a/tests/data/test95
+++ b/tests/data/test95
@@ -52,6 +52,9 @@ HTTP over proxytunnel using POST
  <command>
 http://test.95:%HTTPPORT/we/want/that/page/95 -p -x %HOSTIP:%PROXYPORT -d "datatopost=ohthatsfunyesyes"
 </command>
+<features>
+proxy
+</features>
 </client>
 
 #