From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 3 May 2010 09:24:14 +0000 (+1200)
Subject: Author: Wojciech Zatorski <zator@bg.szczecin.pl>
X-Git-Tag: SQUID_3_2_0_1~235
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9aaf363a85d172b091b01af9a01213a6aee307e6;p=thirdparty%2Fsquid.git

Author: Wojciech Zatorski <zator@bg.szczecin.pl>
Bug 2919: tcp_outgoing_address ACLs not obeying acl_uses_indirect_client
---

diff --git a/src/forward.cc b/src/forward.cc
index 69f131c4f4..a94c7dfa9e 100644
--- a/src/forward.cc
+++ b/src/forward.cc
@@ -1351,6 +1351,11 @@ getOutgoingAddr(HttpRequest * request, struct peer *dst_peer)
     ch.dst_peer = dst_peer;
 
     if (request) {
+#if FOLLOW_X_FORWARDED_FOR
+        if (Config.onoff.acl_uses_indirect_client)
+            ch.src_addr = request->indirect_client_addr;
+        else
+#endif
         ch.src_addr = request->client_addr;
         ch.my_addr = request->my_addr;
     }