Added "HTTP proxy" and "proxytunnel" keywords where applicable

diff --git a/tests/data/test1001 b/tests/data/test1001
index 9f8e53432c14faa803cb50d06d8ee666f75857de..8d1a2d4227b75f4911db8ec0740ef91979dfda59 100644 (file)
--- a/tests/data/test1001
+++ b/tests/data/test1001
@@ -2,8 +2,9 @@
 <info>
 <keywords>
 HTTP
-HTTP Digest auth
 HTTP PUT
+HTTP proxy
+HTTP Digest auth
 Resume
 Content-Range
 CUSTOMREQUEST

diff --git a/tests/data/test1002 b/tests/data/test1002
index 6e51ff610d15ff37012304c6c2d36794a3353c22..bf9bbed9149af2baf8e7f3ccf46dc2ab0f3fe956 100644 (file)
--- a/tests/data/test1002
+++ b/tests/data/test1002
@@ -2,8 +2,9 @@
 <info>
 <keywords>
 HTTP
-HTTP Digest auth
 HTTP PUT
+HTTP proxy
+HTTP Digest auth
 Resume
 Content-Range
 CUSTOMREQUEST

diff --git a/tests/data/test1034 b/tests/data/test1034
index 09b8406f6f8138c64291d6dff94a122d0351b7d2..a710af25bb93948aa0c7b347a59403b99fa8b18a 100644 (file)
--- a/tests/data/test1034
+++ b/tests/data/test1034
@@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
+HTTP proxy
 IDN
 FAILURE
 </keywords>

diff --git a/tests/data/test1035 b/tests/data/test1035
index f982d9d4cf6015bddaf4611078129b5b9af5390f..7f104c7b60259601201ac319700685682f71288a 100644 (file)
--- a/tests/data/test1035
+++ b/tests/data/test1035
@@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
+HTTP proxy
 IDN
 FAILURE
 </keywords>

diff --git a/tests/data/test16 b/tests/data/test16
index 05e630e9edd2228bc81467e8b72d864a22085cd7..d926a1fb19004cb7f90cc125b4812831f73ca673 100644 (file)
--- a/tests/data/test16
+++ b/tests/data/test16
@@ -3,9 +3,11 @@
 <keywords>
 HTTP
 HTTP GET
+HTTP proxy
 HTTP proxy Basic auth
 </keywords>
 </info>
+
 # Server-side
 <reply>
 <data>

diff --git a/tests/data/test165 b/tests/data/test165
index 264d59c9987b96050f5b59cf420ae9369aa300ca..2893696a361cdc4c7b42f3cef8e78579b88a0945 100644 (file)
--- a/tests/data/test165
+++ b/tests/data/test165
@@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
+HTTP proxy
 IDN
 </keywords>
 </info>

diff --git a/tests/data/test170 b/tests/data/test170
index ec9116a672b198efeb742033f8fc5e39c5157486..4db486722d376ef4419c80443e4a3e6be9dde862 100644 (file)
--- a/tests/data/test170
+++ b/tests/data/test170
@@ -1,4 +1,13 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP POST
+HTTP proxy
+HTTP proxy NTLM auth
+</keywords>
+</info>
+
 # Server-side
 <reply>
 </reply>

diff --git a/tests/data/test171 b/tests/data/test171
index 6b79588a5e82b95547d5ab92e1eb209831dcc656..de02d79b5874c5729210dff968b0335166cc395b 100644 (file)
--- a/tests/data/test171
+++ b/tests/data/test171
@@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
+HTTP proxy
 cookies
 </keywords>
 </info>

diff --git a/tests/data/test183 b/tests/data/test183
index 5fd01442a81640d474295610d4e99d0b4e7bbbe9..e9db2ba0ccaec6f4575a7ec1f4ecd010c5fb21e5 100644 (file)
--- a/tests/data/test183
+++ b/tests/data/test183
@@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
+HTTP proxy
 persistent connection
 </keywords>
 </info>

diff --git a/tests/data/test184 b/tests/data/test184
index 48767e2166ed7a9fcc6e049bedc3fd5e878adfa5..0727750f735a8149f8a20fee084774354c2ebd01 100644 (file)
--- a/tests/data/test184
+++ b/tests/data/test184
@@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
+HTTP proxy
 followlocation
 </keywords>
 </info>

diff --git a/tests/data/test185 b/tests/data/test185
index 02bb3d37f31baee35e3a7aa54a1759169c2d7daf..93542aa211f48d5d98014cfb8151e935b2c315c9 100644 (file)
--- a/tests/data/test185
+++ b/tests/data/test185
@@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
+HTTP proxy
 followlocation
 </keywords>
 </info>

diff --git a/tests/data/test208 b/tests/data/test208
index eac3d5572c3790ec3251a9b3c33277612494b488..3c8028e1fc4df4c80427188dd082110769b082f2 100644 (file)
--- a/tests/data/test208
+++ b/tests/data/test208
@@ -1,4 +1,13 @@
 <testcase>
+<info>
+<keywords>
+FTP
+HTTP
+HTTP PUT
+HTTP proxy
+</keywords>
+</info>
+
 # Server-side
 <reply>
 <data>
@@ -20,7 +29,7 @@ http
 ftp
 </features>
  <name>
-HTTP PUT a to a FTP URL with username+password - over HTTP proxy
+HTTP PUT to a FTP URL with username+password - over HTTP proxy
  </name>
  <command>
 -x http://%HOSTIP:%HTTPPORT ftp://daniel:mysecret@host.com/we/want/208 -T log/test208.txt

diff --git a/tests/data/test234 b/tests/data/test234
index 47cd0270ebf219b5a8eccd238d5f9f825186593e..8ea79aef10492f425c16557b9db5bcee25e4ec17 100644 (file)
--- a/tests/data/test234
+++ b/tests/data/test234
@@ -1,4 +1,14 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+HTTP proxy
+HTTP proxy Basic auth
+followlocation
+</keywords>
+</info>
+
 #
 # Server-side
 <reply>

diff --git a/tests/data/test239 b/tests/data/test239
index 29d44af7e0792671848d1f105ac1727c5c048a47..1d0610b57ce14d37055a0a4f15e3312943b9accf 100644 (file)
--- a/tests/data/test239
+++ b/tests/data/test239
@@ -1,4 +1,13 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP POST
+HTTP proxy
+HTTP proxy NTLM auth
+</keywords>
+</info>
+
 # Server-side
 <reply>
 

diff --git a/tests/data/test243 b/tests/data/test243
index a20bd750a62a8ec34f7f76ecd0db11867489b799..3c5a7a2133e1f0724a11e95a18cbd3ef9ed66a67 100644 (file)
--- a/tests/data/test243
+++ b/tests/data/test243
@@ -3,10 +3,12 @@
 <keywords>
 HTTP
 HTTP GET
---proxy-anyauth
+HTTP proxy
 HTTP proxy NTLM auth
+--proxy-anyauth
 </keywords>
 </info>
+
 # Server-side
 <reply>
 

diff --git a/tests/data/test257 b/tests/data/test257
index 1020c613ec41125892a0aeb7780421951531e9c2..c8a11a0ee8ee8af758b119440160145bd81d9e0a 100644 (file)
--- a/tests/data/test257
+++ b/tests/data/test257
@@ -3,10 +3,13 @@
 <keywords>
 HTTP
 HTTP GET
+HTTP proxy
+HTTP Basic auth
 followlocation
 netrc
 </keywords>
 </info>
+
 # Server-side
 <reply>
 <data>

diff --git a/tests/data/test275 b/tests/data/test275
index e07b1a83e884a8f270e7f8d41768ec319035ffe3..17bdfc1cb29c9d184bc0d66cd7f7a47b0e805acd 100644 (file)
--- a/tests/data/test275
+++ b/tests/data/test275
@@ -5,9 +5,12 @@ HTTP
 HTTP GET
 HTTP CONNECT
 HTTP Basic auth
+HTTP proxy
 HTTP proxy Basic auth
+proxytunnel
 </keywords>
 </info>
+
 #
 # Server-side
 <reply>

diff --git a/tests/data/test523 b/tests/data/test523
index 0459d2caf166e34da5f4c993f1161937d77d1319..ff582bdeb461f90353ab830c8a73e3818c17cf0d 100644 (file)
--- a/tests/data/test523
+++ b/tests/data/test523
@@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
+HTTP proxy
 CURLOPT_PORT
 CURLOPT_PROXY
 </keywords>

diff --git a/tests/data/test547 b/tests/data/test547
index 7b0c7324dacc65a7ab376c0fbf8addb9499559cb..b43efc94dd3598bf7d433c25164b02ba21906e13 100644 (file)
--- a/tests/data/test547
+++ b/tests/data/test547
@@ -4,6 +4,7 @@
 HTTP
 HTTP POST
 POST callback
+HTTP proxy
 HTTP proxy NTLM auth
 </keywords>
 </info>

diff --git a/tests/data/test548 b/tests/data/test548
index 5db47638615e642a4419d50db2f2f5609effb131..267adeb5ee4dc8fa2da4e2ebcc2e5aa6bb4cd906 100644 (file)
--- a/tests/data/test548
+++ b/tests/data/test548
@@ -3,9 +3,11 @@
 <keywords>
 HTTP
 HTTP POST
+HTTP proxy
 HTTP proxy NTLM auth
 </keywords>
 </info>
+
 # Server-side
 <reply>
 

diff --git a/tests/data/test549 b/tests/data/test549
index 0c53afa6445e690773eed2487432719559182d2b..654bcea26f7a6ab252778f84d9054d55a62668fd 100644 (file)
--- a/tests/data/test549
+++ b/tests/data/test549
@@ -4,6 +4,7 @@
 FTP
 CURLOPT_PROXY_TRANSFER_MODE
 CURLOPT_PROXY
+HTTP proxy
 </keywords>
 </info>
 

diff --git a/tests/data/test550 b/tests/data/test550
index 8d27d8a4f8c394d5f6c49bd366f8efba703b9d41..16002ba88498901206f446bbd6be783fcd71d7e2 100644 (file)
--- a/tests/data/test550
+++ b/tests/data/test550
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 FTP
+HTTP proxy
 CURLOPT_PROXY_TRANSFER_MODE
 CURLOPT_PROXY
 </keywords>
@@ -36,7 +37,7 @@ ftp
 lib549
 </tool>
  <name>
-FTP RETR over proxy with CURLOPT_PROXY_TRANSFER_MODE and ascii transfer
+FTP RETR over proxy with CURLOPT_PROXY_TRANSFER_MODE and ASCII transfer
  </name>
 # first URL then proxy
  <command>

diff --git a/tests/data/test551 b/tests/data/test551
index b3b6110a000054b91e5455de28aa825616db4590..9319a349ca609778cf4a28f7d7c43874f7b5bd19 100644 (file)
--- a/tests/data/test551
+++ b/tests/data/test551
@@ -5,9 +5,11 @@
 HTTP
 HTTP POST
 POST callback
+HTTP proxy
 HTTP proxy Digest auth
 </keywords>
 </info>
+
 # Server-side
 <reply>
 

diff --git a/tests/data/test552 b/tests/data/test552
index 30d533a92e84a84d5b42c8e65b2f8652a63f343e..f971be7de696db6714292f100c52215eb4ec3d88 100644 (file)
Binary files a/tests/data/test552 and b/tests/data/test552 differ

diff --git a/tests/data/test555 b/tests/data/test555
index 45b38c203858ece1c906eed96eae2f65b08bc0a0..d63197ae9dd0abb05a16883c649a2acf5bca0ff6 100644 (file)
--- a/tests/data/test555
+++ b/tests/data/test555
@@ -7,6 +7,7 @@
 HTTP
 HTTP POST
 POST callback
+HTTP proxy
 HTTP proxy NTLM auth
 multi
 </keywords>

diff --git a/tests/data/test80 b/tests/data/test80
index 419242638c1b46d9282bad104253c601500673a9..dded9681a27a4f7ae4690c8a7c6ebba277fe3ff5 100644 (file)
--- a/tests/data/test80
+++ b/tests/data/test80
@@ -5,9 +5,12 @@ HTTP
 HTTP GET
 HTTP CONNECT
 HTTP Basic auth
+HTTP proxy
 HTTP proxy Basic auth
+proxytunnel
 </keywords>
 </info>
+
 #
 # Server-side
 <reply>

diff --git a/tests/data/test81 b/tests/data/test81
index 3d2ac68fe47aff4963a63c49ee9d9425a58ca67e..f66c354c8bec438d7eaa241939180397ef381530 100644 (file)
--- a/tests/data/test81
+++ b/tests/data/test81
@@ -3,9 +3,11 @@
 <keywords>
 HTTP
 HTTP GET
+HTTP proxy
 HTTP proxy NTLM auth
 </keywords>
 </info>
+
 # Server-side
 <reply>
 

diff --git a/tests/data/test82 b/tests/data/test82
index 7c7f52633c3ce875a4a08b1ca3c870b50f156606..b0eb6295697f19c8cea92e3415c6a5e7aaf1a23a 100644 (file)
--- a/tests/data/test82
+++ b/tests/data/test82
@@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
+HTTP proxy
 HTTP proxy Basic auth
 HTTP proxy NTLM auth
 </keywords>

diff --git a/tests/data/test85 b/tests/data/test85
index bab5d09ce4296afd87ab4e768529a26853de2300..043ef7dab822e5672ee87e56c771be0ddf89408f 100644 (file)
--- a/tests/data/test85
+++ b/tests/data/test85
@@ -4,9 +4,11 @@
 HTTP
 HTTP GET
 HTTP Basic auth
+HTTP proxy
 HTTP proxy Basic auth
 </keywords>
 </info>
+
 #
 # Server-side
 <reply>