From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 29 Jun 2015 12:41:49 +0000 (-0700)
Subject: Add 'tls_outgoing_options disabed' to disable HTTPS proxying
X-Git-Tag: merge-candidate-3-v1~38^2~21^2~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=41ee8990903861b1f8cd8ebd99358b1f2b7e89a1;p=thirdparty%2Fsquid.git

Add 'tls_outgoing_options disabed' to disable HTTPS proxying
---

diff --git a/src/security/PeerOptions.cc b/src/security/PeerOptions.cc
index 94e32741ca..4aeaad3107 100644
--- a/src/security/PeerOptions.cc
+++ b/src/security/PeerOptions.cc
@@ -41,7 +41,9 @@ Security::PeerOptions::PeerOptions(const Security::PeerOptions &p) :
 void
 Security::PeerOptions::parse(const char *token)
 {
-    if (strncmp(token, "cert=", 5) == 0) {
+    if (strncmp(token, "disable", 7) == 0) {
+        clear();
+    } else if (strncmp(token, "cert=", 5) == 0) {
         certFile = SBuf(token + 5);
         if (privateKeyFile.isEmpty())
             privateKeyFile = certFile;