]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Fix cache_peer forceddomain= in CONNECT
authorAymeric Vincent <aymericvincent@free.fr>
Mon, 9 Nov 2015 21:38:44 +0000 (13:38 -0800)
committerAmos Jeffries <squid3@treenet.co.nz>
Mon, 9 Nov 2015 21:38:44 +0000 (13:38 -0800)
src/tunnel.cc

index 44d28c5bcf3506181b4d7160f1c855fbfae13cd5..cd5bbcccfde9ff2a7aa932a87ee8d95588064671 100644 (file)
@@ -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;
     }