From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 22 Oct 2011 00:42:39 +0000 (+1300)
Subject: Fix fastCheck() default result on multi-line actions.
X-Git-Tag: BumpSslServerFirst.take01~86
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b20214316727a59031f293f7e7c112a9be840912;p=thirdparty%2Fsquid.git

Fix fastCheck() default result on multi-line actions.

fastCheck() on multiple lines was using the last lines action instead
of the DUNNO state replacement for inversion.

This updated fastCheck() to only use a config lines result state if that
line fully matched. In accordance with documented ACL behaviour.
---

diff --git a/src/acl/Checklist.cc b/src/acl/Checklist.cc
index b558f18eb9..38d21d383c 100644
--- a/src/acl/Checklist.cc
+++ b/src/acl/Checklist.cc
@@ -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();