From: Trever Adams <trever@middleearth.sapphiresunday.org>
Date: Thu, 6 Apr 2017 16:48:50 +0000 (+1200)
Subject: Bug 4692: SslBump breaks intercepted IPv6 connections
X-Git-Tag: M-staged-PR71~203
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9b219a0676e0f831c4ea4f8741ddee09fac2128;p=thirdparty%2Fsquid.git

Bug 4692: SslBump breaks intercepted IPv6 connections
---

diff --git a/src/client_side.cc b/src/client_side.cc
index 882b8a5e89..f918e84d1b 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -3339,7 +3339,8 @@ ConnStateData::initiateTunneledRequest(HttpRequest::Pointer const &cause, Http::
 
     if (pinning.serverConnection != nullptr) {
         static char ip[MAX_IPSTRLEN];
-        connectHost.assign(pinning.serverConnection->remote.toStr(ip, sizeof(ip)));
+        pinning.serverConnection->remote.toHostStr(ip, sizeof(ip));
+        connectHost.assign(ip);
         connectPort = pinning.serverConnection->remote.port();
     } else if (cause && cause->method == Http::METHOD_CONNECT) {
         // We are inside a (not fully established) CONNECT request
@@ -3376,7 +3377,8 @@ ConnStateData::fakeAConnectRequest(const char *reason, const SBuf &payload)
 #endif
     {
         static char ip[MAX_IPSTRLEN];
-        connectHost.assign(clientConnection->local.toStr(ip, sizeof(ip)));
+        clientConnection->local.toHostStr(ip, sizeof(ip));
+        connectHost.assign(ip);
     }
 
     ClientHttpRequest *http = buildFakeRequest(Http::METHOD_CONNECT, connectHost, connectPort, payload);