summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flup/server/ajp_base.py1
-rw-r--r--flup/server/fcgi_base.py1
-rw-r--r--flup/server/preforkserver.py1
-rw-r--r--flup/server/scgi_base.py1
4 files changed, 4 insertions, 0 deletions
diff --git a/flup/server/ajp_base.py b/flup/server/ajp_base.py
index f28e57d..7f622fc 100644
--- a/flup/server/ajp_base.py
+++ b/flup/server/ajp_base.py
@@ -725,6 +725,7 @@ class Connection(object):
# Restore old handler if timeout was given
if self._timeout:
+ signal.alarm(0)
signal.signal(signal.SIGALRM, old_alarm)
def _shutdown(self, pkt):
diff --git a/flup/server/fcgi_base.py b/flup/server/fcgi_base.py
index 231a56f..56695ab 100644
--- a/flup/server/fcgi_base.py
+++ b/flup/server/fcgi_base.py
@@ -585,6 +585,7 @@ class Request(object):
# Restore old handler if timeout was given
if self._timeout:
+ signal.alarm(0)
signal.signal(signal.SIGALRM, old_alarm)
try:
diff --git a/flup/server/preforkserver.py b/flup/server/preforkserver.py
index 7e5b70f..d8ec84d 100644
--- a/flup/server/preforkserver.py
+++ b/flup/server/preforkserver.py
@@ -265,6 +265,7 @@ class PreforkServer(object):
if self._children.has_key(pid):
del self._children[pid]
+ signal.alarm(0)
signal.signal(signal.SIGALRM, oldSIGALRM)
# Forcefully kill any remaining children.
diff --git a/flup/server/scgi_base.py b/flup/server/scgi_base.py
index 091ddc1..f941deb 100644
--- a/flup/server/scgi_base.py
+++ b/flup/server/scgi_base.py
@@ -287,6 +287,7 @@ class Connection(object):
# Restore old handler if timeout was given
if self._timeout:
+ signal.alarm(0)
signal.signal(signal.SIGALRM, old_alarm)