From: hno <>
Date: Wed, 7 May 2003 02:11:50 +0000 (+0000)
Subject: Fix a merge conflict when forward porting changes from Squid-2.5
X-Git-Tag: SQUID_3_0_PRE1~207
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=de045e1d41a3c24e4d11b0cab85b1661cda9466b;p=thirdparty%2Fsquid.git

Fix a merge conflict when forward porting changes from Squid-2.5
---

diff --git a/src/external_acl.cc b/src/external_acl.cc
index 11458a0f5f..265374e4f9 100644
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -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());