From: Aymeric Vincent <aymericvincent@free.fr>
Date: Mon, 9 Nov 2015 21:38:44 +0000 (-0800)
Subject: Fix cache_peer forceddomain= in CONNECT
X-Git-Tag: SQUID_4_0_3~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bff0cab38ad285368d10b1f271295dd511b1f7f3;p=thirdparty%2Fsquid.git

Fix cache_peer forceddomain= in CONNECT
---

diff --git a/src/tunnel.cc b/src/tunnel.cc
index 44d28c5bcf..cd5bbcccfd 100644
--- a/src/tunnel.cc
+++ b/src/tunnel.cc
@@ -992,9 +992,11 @@ tunnelConnectDone(const Comm::ConnectionPointer &conn, Comm::Flag status, int xe
     debugs(26, 4, HERE << "determine post-connect handling pathway.");
     if (conn->getPeer()) {
         tunnelState->request->peer_login = conn->getPeer()->login;
+        tunnelState->request->peer_domain = conn->getPeer()->domain;
         tunnelState->request->flags.proxying = !(conn->getPeer()->options.originserver);
     } else {
         tunnelState->request->peer_login = NULL;
+        tunnelState->request->peer_domain = NULL;
         tunnelState->request->flags.proxying = false;
     }
 
@@ -1263,9 +1265,11 @@ switchToTunnel(HttpRequest *request, Comm::ConnectionPointer &clientConn, Comm::
     debugs(26, 4, "determine post-connect handling pathway.");
     if (srvConn->getPeer()) {
         tunnelState->request->peer_login = srvConn->getPeer()->login;
+        tunnelState->request->peer_domain = srvConn->getPeer()->domain;
         tunnelState->request->flags.proxying = !(srvConn->getPeer()->options.originserver);
     } else {
         tunnelState->request->peer_login = NULL;
+        tunnelState->request->peer_domain = NULL;
         tunnelState->request->flags.proxying = false;
     }