From a4a7caec2833b0800787c9f9525eb399a9a78bda Mon Sep 17 00:00:00 2001 From: Trever Adams Date: Thu, 4 May 2017 21:32:52 +1200 Subject: [PATCH] Bug 4692: SslBump breaks intercepted IPv6 connections --- src/client_side.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/client_side.cc b/src/client_side.cc index 9fab1f9365..bba6dfe007 100644 --- a/src/client_side.cc +++ b/src/client_side.cc @@ -3338,7 +3338,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 @@ -3375,7 +3376,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); -- 2.47.3