diff options
| author | Marcel Raad <Marcel.Raad@teamviewer.com> | 2019-10-14 22:29:19 +0200 |
|---|---|---|
| committer | Marcel Raad <Marcel.Raad@teamviewer.com> | 2019-10-15 07:56:55 +0200 |
| commit | 476eb88171982a967c35e18d4439de3a848fc916 (patch) | |
| tree | da8651ee956426d1979cede014e40a9ae21ca102 /tests | |
| parent | ee638377328527126ffbe71d1165e12c66830124 (diff) | |
| download | curl-476eb88171982a967c35e18d4439de3a848fc916.tar.gz | |
tests: use proxy feature
This makes the tests succeed when using --disable-proxy.
Closes https://github.com/curl/curl/pull/4488
Diffstat (limited to 'tests')
133 files changed, 287 insertions, 5 deletions
diff --git a/tests/data/test1002 b/tests/data/test1002 index c20995d90..5b6ef9431 100644 --- 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 c123c5c0c..9fca722c8 100644 --- 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 800973d1c..689341d60 100644 --- 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 6820ea679..615e625c9 100644 --- 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 14fc7e53c..c4b264c10 100644 --- 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 c481d39c4..6ddddfee2 100644 --- 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 a3c90245a..e917e8a56 100644 --- 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 a9bb771be..d705dbca4 100644 --- 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 d228976ac..883d98642 100644 --- 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 a807ce9e5..f2b6fc263 100644 --- 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 adef4320b..725a274ba 100644 --- 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 980564810..0d397340c 100644 --- 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 570f13c51..e66da58ad 100644 --- 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 0c6bec177..37a77e36e 100644 --- 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 e18a92325..75b6ee838 100644 --- 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 9c41d3935..b0cff8e37 100644 --- 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 76c6bdf55..5f1e2b35a 100644 --- 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 ecd95d57e..e86c7e154 100644 --- 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 4f22f0d92..46a6938cb 100644 --- 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 3eeb3e3ad..73c799a4a 100644 --- 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 08d74369e..8edfd9b4e 100644 --- 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 be0f5c77a..c4f977b60 100644 --- 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 e3f1f6d04..37c8f4ef0 100644 --- 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 a7e56a797..50af6bc2c 100644 --- 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 ca2f6c67d..860ce21a4 100644 --- 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 d0659f126..7425d44d8 100644 --- 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 aaa568868..bc6c61801 100644 --- 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 65659292d..a35bc89c3 100644 --- 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 74002994b..8f240b0af 100644 --- 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 817b9342b..c05975488 100644 --- 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 09c59f4ff..e86afbb53 100644 --- 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 6b7e93736..16a7c1af6 100644 --- 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 46c292497..976fd6ecf 100644 --- 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 543aa3d6e..d8a1e524c 100644 --- 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 078ada64a..3963bd93f 100644 --- 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 f50c53165..8fc968c89 100644 --- 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 7a15f8091..da4079e93 100644 --- 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 72a52c935..cc9117774 100644 --- 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 3d2d0cb6c..2cec0b895 100644 --- 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 6b5823529..865abd969 100644 --- 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 91abedc33..94ce02c59 100644 --- 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 6c59b2160..dea49e781 100644 --- 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 59041ec96..f09c02dd9 100644 --- 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 e62cd72f2..d1182942e 100644 --- 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 2684d34e9..cbe6fe22e 100644 --- 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 45244e604..27d63f505 100644 --- 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 b4bfc6603..faffc5d9e 100644 --- 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 595da5ea9..673e048c8 100644 --- 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 aa111c890..f6fb44dd5 100644 --- 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 e8d52794b..6bb87d14a 100644 --- 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 876806af4..72c0a32d1 100644 --- 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 33df26824..f7be50367 100644 --- 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 15f4c7a7b..399aa9420 100644 --- 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 ee2f40aa7..099641a87 100644 --- 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 b9a1ed786..9009425aa 100644 --- 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 0b14996a3..e08555ecc 100644 --- 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 20e0b6d9c..fb8762044 100644 --- 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 bb089ca35..8013bcc17 100644 --- 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 8ce7774f9..49d595bbc 100644 --- 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 09e48b70a..482c0b7e2 100644 --- 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 f8f7811a7..3a94c00ba 100644 --- 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 f34dc0c98..cf992a26f 100644 --- 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 8b09dde28..42e652e3b 100644 --- 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 298dd49ce..3bc58a041 100644 --- 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 08ad534a6..760285472 100644 --- 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 81ef79ffc..5eef3dae2 100644 --- 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 cca44942f..a5fac62be 100644 --- 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 0082503e0..65a907f43 100644 --- 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 b74b0bdc1..4272a7b41 100644 --- 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 5f0c88562..f99ac4c71 100644 --- 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 f323eb520..a0b291dc2 100644 --- 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 afb2566b5..1c86558a8 100644 --- 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 a0cc1a533..aded6d2d2 100644 --- 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 819c8016d..82d82c483 100644 --- 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 f10df566b..4ab51a2f3 100644 --- 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 be3f0f3c5..49f17e43f 100644 --- 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 b631e52cf..a38d8c95e 100644 --- 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 1d2e05b39..9e197cd1d 100644 --- 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 c9e5b6ac7..a6f1fd59b 100644 --- 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 7d1ed7d6e..f83218e14 100644 --- 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 17ae807d1..1567c6292 100644 --- 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 502448ddb..59a419bb1 100644 --- 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 98c340141..6c10564b8 100644 --- 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 6e1853601..58d25120f 100644 --- 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 5088141f5..e10c20741 100644 --- 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 f4d171a16..5aca0e6c5 100644 --- 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 2e26ff5e5..ff7d5945e 100644 --- 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 802c4bbcc..6065b4d81 100644 --- 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 3112264a3..620f56b17 100644 --- 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 47f8b687e..d5f4194f1 100644 --- 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 6772e220f..7c29f7f02 100644 --- 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 4daaea47d..cfa743020 100644 --- 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 c6d8697be..68a9b5c79 100644 --- 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 838d1ba0f..fd82c7aed 100644 --- 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 74607d5ee..6cda172f6 100644 --- 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 54b86d2a1..2ffac81f7 100644 --- 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 4d54da980..5817365e3 100644 --- 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 e5535bb3a..196017013 100644 --- 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 b62f1a127..b98d27b3b 100644 --- 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 e8dc21e8d..472149d2a 100644 --- 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 2d3a3dd0d..757faf1bd 100644 --- 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 665211d48..c00a0969d 100644 --- 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 8391cbe78..871c558fb 100644 --- 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 5c4cfaaff..781799b11 100644 --- 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 80b87d10c..fa98cd437 100644 --- 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 a248edbf6..a9f1ca21c 100644 --- 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 a609aa216..1eff72a17 100644 --- 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 ed6aee264..bb31a36f8 100644 --- 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 f8b929839..d4b946614 100644 --- 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 a6188eacf..359e54cca 100644 --- 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 c9df79219..eb9372ed0 100644 --- 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 4c9ecd466..3078e2d08 100644 --- 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 7f30b83ef..6f6250763 100644 --- 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 ccc19dd24..e7d7a4615 100644 --- 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 43e1aaf92..048c0d0f2 100644 --- 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 192338501..53d97c39d 100644 --- 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 b9648fd70..6743b3258 100644 --- 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 6732d0a20..7f891fa95 100644 --- 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 3d5f04e3a..cfbf3419f 100644 --- 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 efec03227..776d8b292 100644 --- 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 56936b946..85372ca24 100644 --- 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 db61dcb39..96167de5c 100644 --- 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 35392443e..dae50d9f2 100644 --- 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 b2566e229..9bc836681 100644 --- 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 147a6aa12..3e61eddde 100644 --- 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 499831bb3..4cc03975e 100644 --- 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 8b58f75da..88d5da84d 100644 --- 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 120bcc6a1..400e0a0f3 100644 --- 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 629dae2fc..4cfde6dbb 100644 --- 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 cb5e6e052..8b4cd6abc 100644 --- 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 138724835..58e47bc6b 100644 --- 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 2f3f4824d..4ca53c63b 100644 --- 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 1cd88acab..afc00aede 100644 --- 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> # |