From: hno <>
Date: Thu, 19 Jul 2007 06:35:27 +0000 (+0000)
Subject: Author: Christos Tsantilas <chtsanti@users.sourceforge.net>
X-Git-Tag: SQUID_3_0_PRE7~165
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5a363fb114c5580da2984dac11cfd49da8272bc7;p=thirdparty%2Fsquid.git

Author: Christos Tsantilas <chtsanti@users.sourceforge.net>
Bug #1984: assertion failed: ACLChecklist.cc:172: "A"

back out incorrect deleteWhenDone patch.
---

diff --git a/src/ACLChecklist.cc b/src/ACLChecklist.cc
index 2a5d4c23e1..c0fdb3a7d2 100644
--- a/src/ACLChecklist.cc
+++ b/src/ACLChecklist.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLChecklist.cc,v 1.39 2007/06/17 21:39:49 hno Exp $
+ * $Id: ACLChecklist.cc,v 1.40 2007/07/19 00:35:27 hno Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -199,12 +199,6 @@ ACLChecklist::asyncInProgress(bool const newAsync)
            " async set to " << async_);
 }
 
-void
-ACLChecklist::markDeleteWhenDone()
-{
-    deleteWhenDone = true;
-}
-
 bool
 ACLChecklist::finished() const
 {
@@ -325,9 +319,6 @@ ACLChecklist::matchAclList(const acl_list * head, bool const fast)
                 continue;
             }
 
-            if (deleteWhenDone && !asyncInProgress())
-                delete this;
-
             PROF_stop(aclMatchAclList);
 
             return;
@@ -372,7 +363,6 @@ ACLChecklist::ACLChecklist() : accessList (NULL), my_port (0), request (NULL),
         conn_(NULL),
         async_(false),
         finished_(false),
-        deleteWhenDone(false),
         allow_(ACCESS_DENIED),
         state_(NullState::Instance()),
         destinationDomainChecked_(false),
diff --git a/src/ACLChecklist.h b/src/ACLChecklist.h
index 3a7a188fbd..36044c08b3 100644
--- a/src/ACLChecklist.h
+++ b/src/ACLChecklist.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ACLChecklist.h,v 1.25 2007/06/17 21:39:49 hno Exp $
+ * $Id: ACLChecklist.h,v 1.26 2007/07/19 00:35:27 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -103,7 +103,6 @@ class NullState : public AsyncState
 
     bool asyncInProgress() const;
     void asyncInProgress(bool const);
-    void markDeleteWhenDone();
     bool finished() const;
     void markFinished();
     void check();
@@ -147,7 +146,6 @@ private:
     ConnStateData::Pointer conn_;	/* hack for ident and NTLM */
     bool async_;
     bool finished_;
-    bool deleteWhenDone;
     allow_t allow_;
     AsyncState *state_;
     bool destinationDomainChecked_;
diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index 80ad6048c8..e647a22b85 100644
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side_request.cc,v 1.90 2007/06/02 11:50:32 hno Exp $
+ * $Id: client_side_request.cc,v 1.91 2007/07/19 00:35:27 hno Exp $
  * 
  * DEBUG: section 85    Client-side Request Routines
  * AUTHOR: Robert Collins (Originally Duane Wessels in client_side.c)
@@ -112,14 +112,6 @@ ClientRequestContext::~ClientRequestContext()
     if (http)
         cbdataReferenceDone(http);
 
-    if (acl_checklist) {
-        if (acl_checklist->asyncInProgress()) {
-            acl_checklist->markDeleteWhenDone();
-        } else {
-            delete acl_checklist;
-        }
-    }
-
     debugs(85,3, HERE << this << " ClientRequestContext destructed");
 }