------------------------------------------------------------
revno: 13719
revision-id: squid3@treenet.co.nz-20150113084451-v0uyw5s1tgiv19t2
parent: squid3@treenet.co.nz-20150109060734-enmch1byp8vezjrf
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.5
timestamp: Tue 2015-01-13 00:44:51 -0800
message:
  squidclient: Fix -A and -P options
  
  With --https addition the A and P values are re-used for --cert and
  --params within HTTPS options. This works for long options, but they
  cannot be listed as short options by the Transport:: module because
  they are required at the top level by old-style HTTP parameters.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20150113084451-v0uyw5s1tgiv19t2
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: e95a33a9b1b63b8187aefb8f9bb512ef002543f1
# timestamp: 2015-01-13 08:46:32 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20150109060734-\
#   enmch1byp8vezjrf
# 
# Begin patch
=== modified file 'tools/squidclient/Transport.cc'
--- tools/squidclient/Transport.cc	2015-01-05 16:47:10 +0000
+++ tools/squidclient/Transport.cc	2015-01-13 08:44:51 +0000
@@ -53,7 +53,7 @@
 Transport::TheConfig::parseCommandOpts(int argc, char *argv[], int c, int &optIndex)
 {
     bool tls = false;
-    const char *shortOpStr = "A:C:h:l:p:P:T:?";
+    const char *shortOpStr = "h:l:p:T:?";
 
     // options for controlling squidclient transport connection
     static struct option longOptions[] = {