From bbdb774b8add0b4e6b0c905656ef94c007650d35 Mon Sep 17 00:00:00 2001
From: wessels <>
Date: Fri, 16 May 1997 13:42:49 +0000
Subject: [PATCH] - rename 'reread/reinitialize' to 'reconfigure'

---
 src/comm.cc     | 20 ++++++++++----------
 src/redirect.cc |  4 ++--
 src/squid.h     |  5 +++--
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/comm.cc b/src/comm.cc
index 87d06e7074..8e9bd70305 100644
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: comm.cc,v 1.152 1997/05/15 23:32:27 wessels Exp $
+ * $Id: comm.cc,v 1.153 1997/05/16 07:42:49 wessels Exp $
  *
  * DEBUG: section 5     Socket Functions
  * AUTHOR: Harvest Derived
@@ -387,7 +387,7 @@ commSetTimeout(int fd, int timeout, PF * handler, void *data)
 	fde->timeout_data = NULL;
 	return fde->timeout = 0;
     }
-    if (shutdown_pending || reread_pending) {
+    if (shutdown_pending || reconfigure_pending) {
 	/* don't increase the timeout if something pending */
 	if (fde->timeout > 0 && (int) (fde->timeout - squid_curtime) < timeout)
 	    return fde->timeout;
@@ -772,7 +772,7 @@ comm_poll(time_t sec)
     do {
 	if (sec > 60)
 	    fatal_dump(NULL);
-	if (shutdown_pending || reread_pending) {
+	if (shutdown_pending || reconfigure_pending) {
 	    serverConnectionsClose();
 	    ftpServerClose();
 	    dnsShutdownServers();
@@ -780,8 +780,8 @@ comm_poll(time_t sec)
 	    /* shutdown_pending will be set to
 	     * +1 for SIGTERM
 	     * -1 for SIGINT */
-	    /* reread_pending always == 1 when SIGHUP received */
-	    if (shutdown_pending > 0 || reread_pending > 0)
+	    /* reconfigure_pending always == 1 when SIGHUP received */
+	    if (shutdown_pending > 0 || reconfigure_pending > 0)
 		setSocketShutdownLifetimes(Config.shutdownLifetime);
 	    else
 		setSocketShutdownLifetimes(1);
@@ -803,7 +803,7 @@ comm_poll(time_t sec)
 		nfds++;
 	    }
 	}
-	if (shutdown_pending || reread_pending)
+	if (shutdown_pending || reconfigure_pending)
 	    debug(5, 2, "comm_poll: Still waiting on %d FDs\n", nfds);
 #ifdef WTFISTHIS
 	if (pending_time == 0)
@@ -942,7 +942,7 @@ comm_select(time_t sec)
 	FD_ZERO(&readfds);
 	FD_ZERO(&writefds);
 
-	if (shutdown_pending || reread_pending) {
+	if (shutdown_pending || reconfigure_pending) {
 	    serverConnectionsClose();
 	    ftpServerClose();
 	    dnsShutdownServers();
@@ -950,8 +950,8 @@ comm_select(time_t sec)
 	    /* shutdown_pending will be set to
 	     * +1 for SIGTERM
 	     * -1 for SIGINT */
-	    /* reread_pending always == 1 when SIGHUP received */
-	    if (shutdown_pending > 0 || reread_pending > 0)
+	    /* reconfigure_pending always == 1 when SIGHUP received */
+	    if (shutdown_pending > 0 || reconfigure_pending > 0)
 		setSocketShutdownLifetimes(Config.shutdownLifetime);
 	    else
 		setSocketShutdownLifetimes(0);
@@ -971,7 +971,7 @@ comm_select(time_t sec)
 		FD_SET(i, &writefds);
 	    }
 	}
-	if (shutdown_pending || reread_pending)
+	if (shutdown_pending || reconfigure_pending)
 	    debug(5, 2, "comm_select: Still waiting on %d FDs\n", nfds);
 	if (nfds == 0)
 	    return COMM_SHUTDOWN;
diff --git a/src/redirect.cc b/src/redirect.cc
index 884d19ffa9..56ddb633fe 100644
--- a/src/redirect.cc
+++ b/src/redirect.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: redirect.cc,v 1.42 1997/05/08 07:22:06 wessels Exp $
+ * $Id: redirect.cc,v 1.43 1997/05/16 07:44:21 wessels Exp $
  *
  * DEBUG: section 29    Redirector
  * AUTHOR: Duane Wessels
@@ -185,7 +185,7 @@ redirectHandleRead(int fd, void *data)
 	put_free_8k_page(redirector->inbuf);
 	redirector->inbuf = NULL;
 	comm_close(fd);
-	if (--NRedirectorsOpen == 0 && !shutdown_pending && !reread_pending)
+	if (--NRedirectorsOpen == 0 && !shutdown_pending && !reconfigure_pending)
 	    fatal_dump("All redirectors have exited!");
 	return;
     }
diff --git a/src/squid.h b/src/squid.h
index b7a0655d64..556ea3508f 100644
--- a/src/squid.h
+++ b/src/squid.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: squid.h,v 1.114 1997/05/15 23:43:12 wessels Exp $
+ * $Id: squid.h,v 1.115 1997/05/16 07:43:08 wessels Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -326,7 +326,7 @@ extern int theInIcpConnection;	/* main.c */
 extern int theOutIcpConnection;	/* main.c */
 extern int vizSock;
 extern volatile int shutdown_pending;	/* main.c */
-extern volatile int reread_pending;	/* main.c */
+extern volatile int reconfigure_pending;/* main.c */
 extern int opt_reload_hit_only;	/* main.c */
 extern int opt_dns_tests;	/* main.c */
 extern int opt_foreground_rebuild;	/* main.c */
@@ -348,6 +348,7 @@ extern int opt_udp_hit_obj;	/* main.c */
 extern int opt_mem_pools;	/* main.c */
 extern int opt_forwarded_for;	/* main.c */
 extern int opt_accel_uses_host;	/* main.c */
+extern int configured_once;	/* main.c */
 extern char ThisCache[];	/* main.c */
 
 /* Prototypes and definitions which don't really deserve a separate
-- 
2.47.2