set lifetimes for sockets only, and do it in reconfigure() too

diff --git a/src/tools.cc b/src/tools.cc
index 09712a893a5c55aaf29f8aaac0fe8b7ff98e3951..a7bb7b2753c927d8d5941af2ab7763437bdb7ba3 100644 (file)
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -1,5 +1,5 @@
 
-/* $Id: tools.cc,v 1.36 1996/04/16 16:35:31 wessels Exp $ */
+/* $Id: tools.cc,v 1.37 1996/04/16 20:32:53 wessels Exp $ */
 
 /*
  * DEBUG: Section 21          tools
@@ -173,7 +173,8 @@ void shut_down(sig)
     for (i = fdstat_biggest_fd(); i >= 0; i--) {
        f = &fd_table[i];
        if (f->read_handler || f->write_handler || f->except_handler)
-           comm_set_fd_lifetime(i, 30);
+           if (fdstatGetType(i) == Socket)
+               comm_set_fd_lifetime(i, 30);
     }
     shutdown_pending = 1;
     /* reinstall signal handler? */
@@ -409,11 +410,18 @@ time_t getCurrentTime()
 void reconfigure(sig)
      int sig;
 {
+    int i;
+    FD_ENTRY *f;
     debug(21, 1, "reconfigure: SIGHUP received.\n");
-
     serverConnectionsClose();
     ipcacheShutdownServers();
     reread_pending = 1;
+    for (i = fdstat_biggest_fd(); i >= 0; i--) {
+       f = &fd_table[i];
+       if (f->read_handler || f->write_handler || f->except_handler)
+           if (fdstatGetType(i) == Socket)
+               comm_set_fd_lifetime(i, 30);
+    }
 #if defined(_SQUID_SYSV_SIGNALS_)
     signal(sig, reconfigure);
 #endif