]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Bug 3226: Tags from external ACLs do not correctly expire
authorAmos Jeffries <squid3@treenet.co.nz>
Sun, 29 May 2011 12:23:12 +0000 (06:23 -0600)
committerAmos Jeffries <squid3@treenet.co.nz>
Sun, 29 May 2011 12:23:12 +0000 (06:23 -0600)
src/external_acl.cc

index ac4e31f5249d157c0b379d4ceb4c4c7d97bff2f5..342e8cb383cdf39e359a409b4dab931fbd3351b5 100644 (file)
@@ -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 <<