From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 1 Nov 2015 10:07:41 +0000 (-0800)
Subject: Fix shutdown aborts after rev.14374
X-Git-Tag: SQUID_4_0_2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b4db757fb10a5ba07006818e015eefa488bc5c36;p=thirdparty%2Fsquid.git

Fix shutdown aborts after rev.14374

Changes to signal processing introduced by rev.14374 causse Squid to
ignore repeated signals.

However, repeated shutdown signals actually has meaning and need to abort
the shutdown delay timeout. So we need to allow those through to the
shutdown signal handler.
---

diff --git a/src/main.cc b/src/main.cc
index 7447889754..5470024097 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -259,6 +259,10 @@ AvoidSignalAction(const char *description, volatile int &signalVar)
     if (shutting_down) {
         currentEvent = "shutdown";
         avoiding = "canceling";
+        // do not avoid repeated shutdown signals
+        // which just means the user wants to skip/abort shutdown timeouts
+        if (strcmp(currentEvent, description) == 0)
+            return false;
         signalVar = 0;
     }
     else if (!configured_once)