From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 30 Mar 2009 11:54:45 +0000 (+1300)
Subject: Author: Christos Tsantilas <chtsanti@users.sourceforge.net>
X-Git-Tag: SQUID_3_1_0_7~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7eb8f41313e82b97089bb093edbbfb3f9b483a62;p=thirdparty%2Fsquid.git

Author: Christos Tsantilas <chtsanti@users.sourceforge.net>
In ACLFilledChecklist::ACLFilledChecklist constructor the HttpRequest

request parameter hides the ACLFilledChecklist::request member.
As a result acl's do not work at all and some cases squid crashes
(eg when dstdomain acls used)
---

diff --git a/src/acl/FilledChecklist.cc b/src/acl/FilledChecklist.cc
index 8c92a639b1..ed76ceb77d 100644
--- a/src/acl/FilledChecklist.cc
+++ b/src/acl/FilledChecklist.cc
@@ -229,7 +229,7 @@ ACLFilledChecklist::markSourceDomainChecked()
  *    *not* delete the list.  After the callback function returns,
  *    checkCallback() will delete the list (i.e., self).
  */
-ACLFilledChecklist::ACLFilledChecklist(const acl_access *A, HttpRequest *request, const char *ident):
+ACLFilledChecklist::ACLFilledChecklist(const acl_access *A, HttpRequest *http_request, const char *ident):
     dst_peer(NULL),
     request(NULL),
     reply(NULL),
@@ -255,8 +255,8 @@ ACLFilledChecklist::ACLFilledChecklist(const acl_access *A, HttpRequest *request
     if (A)
         accessList = cbdataReference(A);
 
-    if (request != NULL) {
-        request = HTTPMSGLOCK(request);
+    if (http_request != NULL) {
+        request = HTTPMSGLOCK(http_request);
 #if FOLLOW_X_FORWARDED_FOR
         if (Config.onoff.acl_uses_indirect_client)
             src_addr = request->indirect_client_addr;