diff options
| author | Allan Saddi <allan@saddi.com> | 2009-11-04 08:46:14 -0800 |
|---|---|---|
| committer | Allan Saddi <allan@saddi.com> | 2009-11-04 08:46:14 -0800 |
| commit | 20e2adf6418a14d111e41286c1dfdad96953f0ed (patch) | |
| tree | 9ed26454d978f84716a0dad218fe124eceb9fde6 | |
| parent | 7d843cd0f4d08cc74dafee9fbb7a521025dacbe6 (diff) | |
| download | flup-20e2adf6418a14d111e41286c1dfdad96953f0ed.tar.gz | |
Cancel alarm before restoring old SIGALRM handler. #43
| -rw-r--r-- | flup/server/ajp_base.py | 1 | ||||
| -rw-r--r-- | flup/server/fcgi_base.py | 1 | ||||
| -rw-r--r-- | flup/server/preforkserver.py | 1 | ||||
| -rw-r--r-- | flup/server/scgi_base.py | 1 |
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) |