From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 29 May 2011 12:23:12 +0000 (-0600)
Subject: Bug 3226: Tags from external ACLs do not correctly expire
X-Git-Tag: SQUID_3_1_12_2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa0a7034df7430d4e65ee3f2f4772699ee37ebe3;p=thirdparty%2Fsquid.git

Bug 3226: Tags from external ACLs do not correctly expire
---

diff --git a/src/external_acl.cc b/src/external_acl.cc
index ac4e31f524..342e8cb383 100644
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -730,12 +730,9 @@ aclMatchExternal(external_acl_data *acl, ACLFilledChecklist *ch)
 
             if (acl->def->theHelper->stats.queue_size <= acl->def->theHelper->n_running) {
                 debugs(82, 2, "aclMatchExternal: \"" << key << "\": queueing a call.");
-                ch->changeState (ExternalACLLookup::Instance());
-
-                if (entry == NULL) {
-                    debugs(82, 2, "aclMatchExternal: \"" << key << "\": return -1.");
-                    return -1;
-                }
+                ch->changeState(ExternalACLLookup::Instance());
+                debugs(82, 2, "aclMatchExternal: \"" << key << "\": return -1.");
+                return -1; // to get here we have to have an expired cache entry. MUST not use.
             } else {
                 if (!entry) {
                     debugs(82, 1, "aclMatchExternal: '" << acl->def->name <<