Performance: ACLFilledChecklist fills istelf from HttpRequest

diff --git a/src/HttpReply.cc b/src/HttpReply.cc
index 2168b4f499dd9c78f5e3682c0944654d02d2957a..26dd9f3e065bd4916a889e15e620f3e095fa5e92 100644 (file)
--- 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 9e694eff11c86fe2730b95e39430ce37d98b6bb7..d55cce5cd194639d2a479880b2c079e7ddc617b1 100644 (file)
--- 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) {