Renamed squid.h to squid-old.h and config.h to squid.h

[thirdparty/squid.git] / src / acl / Checklist.cc

diff --git a/src/acl/Checklist.cc b/src/acl/Checklist.cc
index b558f18eb9c9dc1cf50ea87a49fd458f6b36da0b..496dbf922890ada435d06a7dedca46ddc4878a54 100644 (file)
--- a/src/acl/Checklist.cc
+++ b/src/acl/Checklist.cc
@@ -33,7 +33,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#include "squid.h"
+#include "squid-old.h"
 #include "acl/Checklist.h"
 
 allow_t const &
@@ -216,7 +216,6 @@ ACLChecklist::matchAclList(const ACLList * head, bool const fast)
         }
 
         if (!nodeMatched || state_ != NullState::Instance()) {
-            debugs(28, 3, "aclmatchAclList: " << this << " returning false (AND list entry failed to match)");
 
             bool async = state_ != NullState::Instance();
 
@@ -230,6 +229,7 @@ ACLChecklist::matchAclList(const ACLList * head, bool const fast)
                    " finished() = " << finished());
 
             if (finished()) {
+                debugs(28, 3, "aclmatchAclList: " << this << " returning (AND list entry failed to match)");
                 PROF_stop(aclMatchAclList);
                 return;
             }
@@ -240,8 +240,8 @@ ACLChecklist::matchAclList(const ACLList * head, bool const fast)
                 continue;
             }
 
+            debugs(28, 3, "aclmatchAclList: " << this << " returning (AND list entry awaiting an async lookup)");
             PROF_stop(aclMatchAclList);
-
             return;
         }
 
@@ -350,9 +350,9 @@ ACLChecklist::fastCheck()
     debugs(28, 5, "aclCheckFast: list: " << accessList);
     const acl_access *acl = cbdataReference(accessList);
     while (acl != NULL && cbdataReferenceValid(acl)) {
-        currentAnswer(acl->allow);
         matchAclList(acl->aclList, true);
         if (finished()) {
+            currentAnswer(acl->allow);
             PROF_stop(aclCheckFast);
             cbdataReferenceDone(acl);
             return currentAnswer();