]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Fix a merge conflict when forward porting changes from Squid-2.5
authorhno <>
Wed, 7 May 2003 02:11:50 +0000 (02:11 +0000)
committerhno <>
Wed, 7 May 2003 02:11:50 +0000 (02:11 +0000)
src/external_acl.cc

index 11458a0f5fe298edfd2a64b8c81ec187c8495db7..265374e4f97f014ea537d992bfd00842cca0b5d9 100644 (file)
@@ -1,6 +1,6 @@
 
 /*
- * $Id: external_acl.cc,v 1.37 2003/05/06 00:20:03 hno Exp $
+ * $Id: external_acl.cc,v 1.38 2003/05/06 20:11:50 hno Exp $
  *
  * DEBUG: section 82    External ACL
  * AUTHOR: Henrik Nordstrom, MARA Systems AB
@@ -534,7 +534,7 @@ aclMatchExternal(external_acl_data *acl, ACLChecklist * ch)
     if (!entry || entry->result == -1) {
         debug(82, 2) ("aclMatchExternal: %s(\"%s\") = lookup needed\n", acl->def->name, key);
 
-        if (acl->def->helper->stats.queue_size >= acl->def->helper->n_running)
+        if (acl->def->theHelper->stats.queue_size >= acl->def->theHelper->n_running)
             debug(82, 1) ("aclMatchExternal: '%s' queue overload. Request rejected.\n", acl->def->name);
         else
             ch->changeState (ExternalACLLookup::Instance());