From: hno <>
Date: Mon, 27 Dec 2004 22:57:15 +0000 (+0000)
Subject: Bug #1174: acl based access logging causes assertion failure "!finished() && !asyncIn... 
X-Git-Tag: SQUID_3_0_PRE4~930
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba63443af4eea95426d7071b762f5002e1bc87f4;p=thirdparty%2Fsquid.git

Bug #1174: acl based access logging causes assertion failure "!finished() && !asyncInProgress()" (ACLChecklist.cc::markFinished)
---

diff --git a/src/ACLChecklist.cc b/src/ACLChecklist.cc
index 477bdfa70c..bcb2499a50 100644
--- a/src/ACLChecklist.cc
+++ b/src/ACLChecklist.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLChecklist.cc,v 1.24 2004/12/24 01:14:23 hno Exp $
+ * $Id: ACLChecklist.cc,v 1.25 2004/12/27 15:57:15 hno Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -242,6 +242,8 @@ ACLChecklist::matchAclList(const acl_list * head, bool const fast)
     PROF_start(aclMatchAclList);
     const acl_list *node = head;
 
+    finished_ = false;
+
     while (node) {
         bool nodeMatched = node->matches(this);
 
@@ -249,7 +251,6 @@ ACLChecklist::matchAclList(const acl_list * head, bool const fast)
             changeState(NullState::Instance());
 
         if (!nodeMatched || state_ != NullState::Instance()) {
-            finished_ = false;
             debug(28, 3) ("aclmatchAclList: %p returning false (AND list entry failed to match)\n", this);
             checkForAsync();
             PROF_stop(aclMatchAclList);