---------------------
PatchSet 11491 
Date: 2007/06/23 21:33:24
Author: hno
Branch: SQUID_2_6
Tag: (none) 
Log:
MFC: Bug #1900: Double "squid -k shutdown" makes Squid restart again

Merged changes:
2007/06/17 22:08:46	hno	+5 -1	Bug #1900: Double "squid -k shutdown" makes Squid restart again

Members: 
	src/main.c:1.393.2.2->1.393.2.3 

Index: squid/src/main.c
===================================================================
RCS file: /cvsroot/squid/squid/src/main.c,v
retrieving revision 1.393.2.2
retrieving revision 1.393.2.3
diff -u -r1.393.2.2 -r1.393.2.3
--- squid/src/main.c	12 Mar 2007 22:25:40 -0000	1.393.2.2
+++ squid/src/main.c	23 Jun 2007 21:33:24 -0000	1.393.2.3
@@ -1,6 +1,6 @@
 
 /*
- * $Id: main.c,v 1.393.2.2 2007/03/12 22:25:40 hno Exp $
+ * $Id: main.c,v 1.393.2.3 2007/06/23 21:33:24 hno Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -1053,6 +1053,10 @@
 	    case SIGKILL:
 		exit(0);
 		break;
+	    case SIGINT:
+	    case SIGTERM:
+		syslog(LOG_ALERT, "Exiting due to unexpected forced shutdown");
+		exit(1);
 	    default:
 		break;
 	    }