From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 12 Jun 2012 07:01:02 +0000 (-0600)
Subject: Performance: ACLFilledChecklist fills istelf from HttpRequest
X-Git-Tag: BumpSslServerFirst.take09~3^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d3ed24f1a47b4eea91472b83023c42f2a87a408f;p=thirdparty%2Fsquid.git

Performance: ACLFilledChecklist fills istelf from HttpRequest
---

diff --git a/src/HttpReply.cc b/src/HttpReply.cc
index 2168b4f499..26dd9f3e06 100644
--- a/src/HttpReply.cc
+++ b/src/HttpReply.cc
@@ -595,13 +595,6 @@ HttpReply::calcMaxBodySize(HttpRequest& request)
         return;
 
     ACLFilledChecklist ch(NULL, &request, NULL);
-#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;
     ch.reply = HTTPMSGLOCK(this); // XXX: this lock makes method non-const
     for (acl_size_t *l = Config.ReplyBodySize; l; l = l -> next) {
         /* if there is no ACL list or if the ACLs listed match use this size value */
diff --git a/src/forward.cc b/src/forward.cc
index 9e694eff11..d55cce5cd1 100644
--- a/src/forward.cc
+++ b/src/forward.cc
@@ -1279,16 +1279,6 @@ getOutgoingAddress(HttpRequest * request, Comm::ConnectionPointer conn)
     // TODO use the connection details in ACL.
     // needs a bit of rework in ACLFilledChecklist to use Comm::Connection instead of ConnStateData
 
-    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;
-    }
-
     acl_address *l;
     for (l = Config.accessList.outgoing_address; l; l = l->next) {