From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 26 Jul 2013 11:26:04 +0000 (-0600)
Subject: Fix missing bits of rev.12961
X-Git-Tag: SQUID_3_5_0_1~682
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6507233bda102f649cfac818496d0038faaae6be;p=thirdparty%2Fsquid.git

Fix missing bits of rev.12961
---

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 218620a362..82a7fe2363 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -3814,7 +3814,7 @@ parsePortCfg(AnyP::PortCfg ** head, const char *optionName)
     }
 
 #if USE_SSL
-    if (transport.protocol == AnyP::PROTO_HTTPS) {
+    if (s->transport.protocol == AnyP::PROTO_HTTPS) {
         /* ssl-bump on https_port configuration requires either tproxy or intercept, and vice versa */
         const bool hijacked = s->flags.isIntercepted();
         if (s->flags.tunnelSslBumping && !hijacked) {
diff --git a/src/client_side.cc b/src/client_side.cc
index 39508e8ef6..4f0f579e56 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -4089,7 +4089,7 @@ clientHttpConnectionsOpen(void)
 
 #if USE_SSL
         if (s->flags.tunnelSslBumping && !Config.accessList.ssl_bump) {
-            debugs(33, DBG_IMPORTANT, "WARNING: No ssl_bump configured. Disabling ssl-bump on " << s->protocol << "_port " << s->s);
+            debugs(33, DBG_IMPORTANT, "WARNING: No ssl_bump configured. Disabling ssl-bump on " << URLScheme(s->transport.protocol) << "_port " << s->s);
             s->flags.tunnelSslBumping = false;
         }
 
@@ -4146,7 +4146,7 @@ clientHttpsConnectionsOpen(void)
 
         // TODO: merge with similar code in clientHttpConnectionsOpen()
         if (s->flags.tunnelSslBumping && !Config.accessList.ssl_bump) {
-            debugs(33, DBG_IMPORTANT, "WARNING: No ssl_bump configured. Disabling ssl-bump on " << s->protocol << "_port " << s->s);
+            debugs(33, DBG_IMPORTANT, "WARNING: No ssl_bump configured. Disabling ssl-bump on " << URLScheme(s->transport.protocol) << "_port " << s->s);
             s->flags.tunnelSslBumping = false;
         }