From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 10 Apr 2009 08:46:48 +0000 (+1200)
Subject: Bug 2518: assertion failed: comm.cc:1519: "F->flags.open"
X-Git-Tag: SQUID_3_0_STABLE14~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3ab7623728400ed387a42f1a19e1706e37b3116;p=thirdparty%2Fsquid.git

Bug 2518: assertion failed: comm.cc:1519: "F->flags.open"

Not seen in a while. I suspect its hiding behind a fixed F->closing()
test, so the whole if test may be obsolete.

Applying in order to close the bug with surety and sync the conditions on
shutdown and restart-closing.
---

diff --git a/src/comm.cc b/src/comm.cc
index 4bb5e98692..707b53d611 100644
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -1513,7 +1513,8 @@ _comm_close(int fd, char const *file, int line)
     if (F->flags.closing)
         return;
 
-    if (shutting_down && (!F->flags.open || F->type == FD_FILE))
+    /* XXX: is this obsolete behind F->closing() ? */
+    if ( (shutting_down || reconfiguring) && (!F->flags.open || F->type == FD_FILE))
         return;
 
     assert(F->flags.open);