---------------------
PatchSet 4733 
Date: 2007/06/14 07:34:56
Author: amosjeffries
Branch: squid3-ipv6
Tag: (none) 
Log:
Fix Bug #1900: squid -k shutdown fails to close parent.

Members: 
	src/main.cc:1.42.4.13->1.42.4.14 

Index: squid3/src/main.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/main.cc,v
retrieving revision 1.42.4.13
retrieving revision 1.42.4.14
diff -u -r1.42.4.13 -r1.42.4.14
--- squid3/src/main.cc	8 Jun 2007 13:29:11 -0000	1.42.4.13
+++ squid3/src/main.cc	14 Jun 2007 07:34:56 -0000	1.42.4.14
@@ -1,6 +1,6 @@
 
 /*
- * $Id: main.cc,v 1.42.4.13 2007/06/08 13:29:11 amosjeffries Exp $
+ * $Id: main.cc,v 1.42.4.14 2007/06/14 07:34:56 amosjeffries Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -1539,8 +1539,8 @@
                    pid, WEXITSTATUS(status));
         } else if (WIFSIGNALED(status)) {
             syslog(LOG_NOTICE,
-                   "Squid Parent: child process %d exited due to signal %d",
-                   pid, WTERMSIG(status));
+                   "Squid Parent: child process %d exited due to signal %d with status %d",
+                   pid, WTERMSIG(status), WEXITSTATUS(status));
         } else {
             syslog(LOG_NOTICE, "Squid Parent: child process %d exited", pid);
         }
@@ -1562,6 +1562,7 @@
         if (WIFSIGNALED(status)) {
             switch (WTERMSIG(status)) {
 
+            case SIGTERM:
             case SIGKILL:
                 exit(0);
                 break;