From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 27 Mar 2009 22:29:32 +0000 (+1300)
Subject: Bug 2518: assertion failed: comm.cc:1519: "F->flags.open"
X-Git-Tag: SQUID_3_2_0_1~1096
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=36afac265a8afcf9af3ad761899bafd79f04de63;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 a42c642958..30fde7b883 100644
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -1548,7 +1548,8 @@ _comm_close(int fd, char const *file, int line)
     if (F->closing())
         return;
 
-    if (shutting_down && (!F->flags.open || F->type == FD_FILE))
+    /* XXX: is this obsolete behind F->closing() ? */
+    if ( (shutting_down || restarting) && (!F->flags.open || F->type == FD_FILE))
         return;
 
     /* The following fails because ipc.c is doing calls to pipe() to create sockets! */
diff --git a/test-suite/buildtest.sh b/test-suite/buildtest.sh
index 873dbf85b2..314bb4b883 100755
--- a/test-suite/buildtest.sh
+++ b/test-suite/buildtest.sh
@@ -39,7 +39,7 @@ fi
 # do not build any of the install's ...
 rm -f -r src/fs/aufs/.deps src/fs/diskd/.deps &&
 	$base/../configure --silent ${OPTS} 2>&1 &&
-	make ${pjobs} check 2>&1 &&
+	make ${pjobs} distcheck 2>&1 &&
 	make ${pjobs} 2>&1
 
 # Remember and then explicitly return the result of the last command