squidclient: rename --tls to --https

diff --git a/tools/squidclient/Transport.cc b/tools/squidclient/Transport.cc
index c95abcf24d989505eaf083f58647b87700d08cb7..1c62d088e121b11a2a5346e04858f33e449367bd 100644 (file)
--- a/tools/squidclient/Transport.cc
+++ b/tools/squidclient/Transport.cc
@@ -25,10 +25,10 @@ Transport::TheConfig::usage()
               << "  -p | --port port     Port number on server to contact. Default is " << CACHE_HTTP_PORT << "." << std::endl
               << "  -T timeout           Timeout in seconds for read/write operations" << std::endl
 #if USE_GNUTLS
-              << "  --tls [TLS options]  Use TLS on the connection" << std::endl
+              << "  --https              Use TLS/SSL on the HTTP connection" << std::endl
               << std::endl
               << "  TLS options:" << std::endl
-              << "    --anonymous        Use Anonymous TLS. Sets default parameters:" << std::endl
+              << "    --anonymous-tls    Use Anonymous TLS. Sets default parameters:" << std::endl
               << "                         \"PERFORMANCE:+ANON-ECDH:+ANON-DH\"" << std::endl
               << "    --params=\"...\"   Use the given parameters." << std::endl
               << "    --cert=FILE        Path to a PEM file holding the client X.509 certificate chain." << std::endl
@@ -36,8 +36,8 @@ Transport::TheConfig::usage()
               << "    --trusted-ca=PATH  Path to a PEM file holding trusted CA certificate(s)." << std::endl
               << "                       May be repeated." << std::endl
               << "                       Example path: \"/etc/ssl/certs/ca-certificates.crt\"" << std::endl
-              << std::endl;
 #endif
+              << std::endl;
 }
 
 bool
@@ -48,8 +48,8 @@ Transport::TheConfig::parseCommandOpts(int argc, char *argv[], int c, int &optIn
 
     // options for controlling squidclient transport connection
     static struct option longOptions[] = {
-        {"anonymous",    no_argument, 0, '\1'},
-        {"tls",          no_argument, 0, '\3'},
+        {"anonymous-tls",no_argument, 0, '\1'},
+        {"https",        no_argument, 0, '\3'},
         {"trusted-ca",   required_argument, 0, 'A'},
         {"cert",         required_argument, 0, 'C'},
         {"host",         required_argument, 0, 'h'},

diff --git a/tools/squidclient/squidclient.1 b/tools/squidclient/squidclient.1
index 662374b01aae6829cf90a4bae4173c04a0bed220..2a1f95613b384ea82bc2889dcabb2d96d1076636 100644 (file)
--- a/tools/squidclient/squidclient.1
+++ b/tools/squidclient/squidclient.1
@@ -9,7 +9,7 @@ A simple HTTP web client tool
 .if !'po4a'hide' .B squidclient
 .if !'po4a'hide' .B "[ \-aknNrsv ] "
 .if !'po4a'hide' .B "[ \-\-ping [ping\-options] ] "
-.if !'po4a'hide' .B "[ \-\-tls [tls\-options] ] [ \-A"
+.if !'po4a'hide' .B "[ \-\-https] [tls\-options] [ \-A"
 string
 .if !'po4a'hide' .B "] [ \-h | \-\-host"
 remote host
@@ -50,7 +50,7 @@ count
 interval
 .if !'po4a'hide' .B "] "
 .
-.if !'po4a'hide' .B "TLS options: [ \-\-anonymous ] [ \-\-trusted\-ca"
+.if !'po4a'hide' .B "TLS options: [ \-\-anonymous\-tls ] [ \-\-trusted\-ca"
 CA certificates file
 .if !'po4a'hide' .B "...] [ \-\-cert"
 client X.509 certificate file
@@ -186,27 +186,12 @@ Proxy authentication password
 .if !'po4a'hide' .B "\-W password"
 WWW authentication password
 .
-.if !'po4a'hide' .TP 10
-.if !'po4a'hide' .B "\-\-ping [options]"
-Enable ping mode. Optional \-g and \-I parameters must follow immediately if used.
-Repeated use resets to default ping settings.
-.
-.if !'po4a'hide' .TP 12
-.if !'po4a'hide' .B "\-g count"
-Ping mode, perform
-.I count
-iterations (default is to loop until interrupted).
-.
 .if !'po4a'hide' .TP
-.if !'po4a'hide' .B "\-I interval"
-Ping interval in seconds (default 1 second).
+.if !'po4a'hide' .B "\-\-https"
+Use Transport Layer Security on the HTTP connection.
 .
-.if !'po4a'hide' .TP 10
-.if !'po4a'hide' .B "\-\-tls [options]"
-Use Transport Layer Security on the connection.
-.
-.if !'po4a'hide' .TP 12
-.if !'po4a'hide' .B "\-\-anonymous"
+.if !'po4a'hide' .TP
+.if !'po4a'hide' .B "\-\-anonymous\-tls"
 Use TLS with unauthenticated (anonymous) certificate.
 .
 .if !'po4a'hide' .TP
@@ -214,18 +199,33 @@ Use TLS with unauthenticated (anonymous) certificate.
 File containing client X.509 certificate in PEM format.
 May be repeated to load several client certificates.
 .
-.if !'po4a'hide' .TP 12
+.if !'po4a'hide' .TP
 .if !'po4a'hide' .B "\-\-trusted-ca file"
 File containing trusted Certificate Authority (CA) certificates in PEM format.
 May be repeated to load any number of files.
 .
-.if !'po4a'hide' .TP 12
+.if !'po4a'hide' .TP
 .if !'po4a'hide' .B "\-\-params values"
 TLS library specific parameters for the communication session.
 See the library documentation for details on valid parameters.
 .if !'po4a'hide' .I "GnuTLS: http://gnutls.org/manual/html_node/Priority\-Strings.html"
 If repeated only the last value will have effect.
 .
+.if !'po4a'hide' .TP 10
+.if !'po4a'hide' .B "\-\-ping [options]"
+Enable ping mode. Optional \-g and \-I parameters must follow immediately if used.
+Repeated use resets to default ping settings.
+.
+.if !'po4a'hide' .TP 12
+.if !'po4a'hide' .B "\-g count"
+Ping mode, perform
+.I count
+iterations (default is to loop until interrupted).
+.
+.if !'po4a'hide' .TP
+.if !'po4a'hide' .B "\-I interval"
+Ping interval in seconds (default 1 second).
+.
 .SH AUTHOR
 Derived from Harvest. Further developed by by numerous individuals from
 the internet community. Development is led by Duane Wessels of the

diff --git a/tools/squidclient/squidclient.cc b/tools/squidclient/squidclient.cc
index 2cb3c8859226fd050b1abdfd1ac9917fee245430..bed5253ec32d46fe024677b5d80271d9c64d1cd0 100644 (file)
--- a/tools/squidclient/squidclient.cc
+++ b/tools/squidclient/squidclient.cc
@@ -206,7 +206,7 @@ main(int argc, char *argv[])
             {"local",   required_argument, 0, 'l'},
             {"port",    required_argument, 0, 'p'},
             {"ping",    no_argument, 0, '\1'},
-            {"tls",     no_argument, 0, '\3'},
+            {"https",   no_argument, 0, '\3'},
             {0, 0, 0, 0}
         };