From: wessels <>
Date: Tue, 11 Aug 1998 11:53:49 +0000 (+0000)
Subject: dont force closing of IPC sockets with commCloseAllSockets during shutdown
X-Git-Tag: SQUID_3_0_PRE1~2921
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=de718ec470ad27ad7acd80d72da522de5c5aaa5f;p=thirdparty%2Fsquid.git

dont force closing of IPC sockets with commCloseAllSockets during shutdown
---

diff --git a/src/comm.cc b/src/comm.cc
index ab32b03f1b..6215c99152 100644
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -1,7 +1,7 @@
 
 
 /*
- * $Id: comm.cc,v 1.281 1998/07/29 02:57:35 wessels Exp $
+ * $Id: comm.cc,v 1.282 1998/08/11 05:53:49 wessels Exp $
  *
  * DEBUG: section 5     Socket Functions
  * AUTHOR: Harvest Derived
@@ -881,6 +881,8 @@ commCloseAllSockets(void)
 	    continue;
 	if (F->type != FD_SOCKET)
 	    continue;
+	if (F->flags.ipc)	/* don't close inter-process sockets */
+	    continue;
 	if (F->timeout_handler) {
 	    debug(5, 5) ("commCloseAllSockets: FD %d: Calling timeout handler\n",
 		fd);
diff --git a/src/ipc.cc b/src/ipc.cc
index b49cb98dd4..3b7fbd39c5 100644
--- a/src/ipc.cc
+++ b/src/ipc.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ipc.cc,v 1.9 1998/08/10 19:37:48 wessels Exp $
+ * $Id: ipc.cc,v 1.10 1998/08/11 05:53:50 wessels Exp $
  *
  * DEBUG: section 54    Interprocess Communication
  * AUTHOR: Duane Wessels
@@ -198,6 +198,8 @@ ipcCreate(int type, const char *prog, char *const args[], const char *name, int
 	    *rfd = prfd;
 	if (wfd)
 	    *wfd = pwfd;
+	fd_table[prfd].flags.ipc = 1;
+	fd_table[pwfd].flags.ipc = 1;
 	return pwfd;
     }
     /* child */
diff --git a/src/structs.h b/src/structs.h
index 298e609048..41aa246c28 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.194 1998/08/03 19:30:27 wessels Exp $
+ * $Id: structs.h,v 1.195 1998/08/11 05:53:50 wessels Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -490,6 +490,7 @@ struct _fde {
 	int socket_eof:1;
 	int nolinger:1;
 	int nonblocking:1;
+	int ipc:1;
     } flags;
     int bytes_read;
     int bytes_written;