Added key words to all SSL-using tests so they can be skipped if necessary.

Removed a few unnecessary requires SSL statements.

diff --git a/CHANGES b/CHANGES
index 98e29d9b6a33c37df6f7473cfbce4d714cf2e2e8..28e8d1fb57882c409c810e2b742c4eb7d6045b22 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@
 
                                   Changelog
 
+Daniel Fandrich (8 Feb 2007)
+- Added key words to all SSL-using tests so they can be skipped if necessary.
+  Removed a few unnecessary requires SSL statements.
+
 Daniel S (8 Feb 2008)
 - Mike Hommey filed and fixed bug report #1889856
   (http://curl.haxx.se/bug/view.cgi?id=1889856): When using the gnutls ssl

diff --git a/tests/data/test146 b/tests/data/test146
index d9e52c8b900769a1685302e2ce0f729a70eda268..e04f8f04d77672157141425628de55888c90fd74 100644 (file)
--- a/tests/data/test146
+++ b/tests/data/test146
@@ -3,9 +3,10 @@
 <keywords>
 FTP
 RETR
-persistant connection
+persistent connection
 </keywords>
 </info>
+
 # Server-side
 <reply>
 <data>
@@ -19,7 +20,7 @@ this is file contents
 ftp
 </server>
  <name>
-persistant FTP with different paths
+persistent FTP with different paths
  </name>
  <command>
 ftp://%HOSTIP:%FTPPORT/first/dir/here/146 ftp://%HOSTIP:%FTPPORT/146

diff --git a/tests/data/test183 b/tests/data/test183
index cf20083f98dd99869c076a61d0a82bcf2fb266d6..5fd01442a81640d474295610d4e99d0b4e7bbbe9 100644 (file)
--- a/tests/data/test183
+++ b/tests/data/test183
@@ -1,4 +1,12 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+persistent connection
+</keywords>
+</info>
+
 # Server-side
 <reply>
 <data>
@@ -15,9 +23,6 @@ moo
 <server>
 http
 </server>
-<features>
-SSL
-</features>
  <name>
 HTTP GET two URLs over a single proxy with persistent connection
  </name>

diff --git a/tests/data/test184 b/tests/data/test184
index 3f1403bb3ae6dfe961d1ae7d53fc8e2acf96f1a9..e7b860e86ea05d450c83388adb23550631da96b4 100644 (file)
--- a/tests/data/test184
+++ b/tests/data/test184
@@ -1,4 +1,12 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+followlocation
+</keywords>
+
+</info>
 # Server-side
 <reply>
 <data>
@@ -35,9 +43,6 @@ moo
 <server>
 http
 </server>
-<features>
-SSL
-</features>
  <name>
 HTTP replace Host: when following Location: to new host
  </name>

diff --git a/tests/data/test185 b/tests/data/test185
index 3ba31f888f4cbe95d2c3ff81074ce4707879b9a3..fafd04e4b44fad38e7ff5a7ee88eca49b6a55717 100644 (file)
--- a/tests/data/test185
+++ b/tests/data/test185
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+followlocation
+</keywords>
+
 # Server-side
 <reply>
 <data>
@@ -35,9 +42,6 @@ moo
 <server>
 http
 </server>
-<features>
-SSL
-</features>
  <name>
 HTTP replace Host: when following Location: on the same host
  </name>

diff --git a/tests/data/test300 b/tests/data/test300
index 3100556063a4f7ed786299d640fc62425f2d61f8..7b4222d1234d19074ac5c64b331644810e6b7b6a 100644 (file)
--- a/tests/data/test300
+++ b/tests/data/test300
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTPS
+HTTP GET
+</keywords>
+</info>
+
 #
 # Server-side
 <reply>

diff --git a/tests/data/test301 b/tests/data/test301
index 9d0f7d807bb29163590ad9cc2b33051130ba7442..d5974ce693d90593744dd4b769e5f5bddc55dd43 100644 (file)
--- a/tests/data/test301
+++ b/tests/data/test301
@@ -1,4 +1,12 @@
 <testcase>
+<info>
+<keywords>
+HTTPS
+HTTP GET
+HTTP Basic auth
+</keywords>
+</info>
+
 #
 # Server-side
 <reply>

diff --git a/tests/data/test302 b/tests/data/test302
index c989b72638bbbcc1ceb5e57a79803084daf56cc6..1223f1c3313c81c5421096f90b0a15bb470ff41b 100644 (file)
--- a/tests/data/test302
+++ b/tests/data/test302
@@ -1,4 +1,14 @@
 <testcase>
+<info>
+<keywords>
+HTTPS
+HTTP GET
+HTTP CONNECT
+HTTP proxy
+FAILURE
+</keywords>
+</info>
+
 # Client-side
 <client>
 <features>

diff --git a/tests/data/test304 b/tests/data/test304
index 5fb352778a43a4f36956c910ba2fcc1cf2ced108..fedf18ff5a441b84bf6f3d9cc68665e1ed26b739 100644 (file)
--- a/tests/data/test304
+++ b/tests/data/test304
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTPS
+HTTP POST
+</keywords>
+</info>
+
 # Server-side
 <reply>
 <data>

diff --git a/tests/data/test305 b/tests/data/test305
index cfd210da9c853214a183a5182035035a9c722178..858a0040e18b7a86780879107b5cdb56abc58439 100644 (file)
--- a/tests/data/test305
+++ b/tests/data/test305
@@ -1,4 +1,12 @@
 <testcase>
+<info>
+<keywords>
+HTTPS
+HTTP GET
+FAILURE
+</keywords>
+</info>
+
 # Client-side
 <client>
 <features>

diff --git a/tests/data/test306 b/tests/data/test306
index e463c4b5bf818ae0ee00cd4dc0605983bf42db5e..95d4cef35616fbf51131b78d9b2ae0379897f027 100644 (file)
--- a/tests/data/test306
+++ b/tests/data/test306
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTPS
+HTTP GET
+</keywords>
+</info>
+
 #
 # Server-side
 <reply>

diff --git a/tests/data/test307 b/tests/data/test307
index 8c954195aa7bd5c1a35a6cf49bc892e7b4694516..03c2b3c2d0aa49c1e3e710a2fcbf8d0125b2a2a8 100644 (file)
--- a/tests/data/test307
+++ b/tests/data/test307
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTPS
+HTTP GET
+</keywords>
+</info>
+
 #
 # Server-side
 <reply>

diff --git a/tests/data/test308 b/tests/data/test308
index cc7b32296cc2160fe4e2dd076da9368403860404..d20556a1997574192f67b57ac8ce524e2b72c11e 100644 (file)
--- a/tests/data/test308
+++ b/tests/data/test308
@@ -1,4 +1,12 @@
 <testcase>
+<info>
+<keywords>
+HTTPS
+HTTP GET
+FAILURE
+</keywords>
+</info>
+
 #
 # Client-side
 <client>

diff --git a/tests/data/test509 b/tests/data/test509
index 3ed434eaa3e9dce4ad4367137a028271ad215653..d29a4ba782cad661518ebddd7941160a804816b8 100644 (file)
--- a/tests/data/test509
+++ b/tests/data/test509
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTPS
+HTTP GET
+</keywords>
+</info>
+
 #
 # Server-side
 <reply>

diff --git a/tests/data/test94 b/tests/data/test94
index 63aae01e430b94d14f7bf4dcba404f66e077c20a..6660302a1e086b1ef3bdf81c89000fb6e27f3aaa 100644 (file)
--- a/tests/data/test94
+++ b/tests/data/test94
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 HTTPS
+HTTP GET
 HTTP CONNECT
 HTTP proxy
 FAILURE