summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--flup/server/threadedserver.py3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2395254..540403a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-14 Allan Saddi <allan@saddi.com>
+
+ * Don't try to restore signal handlers if they weren't installed in
+ the first place.
+
2010-10-05 Allan Saddi <allan@saddi.com>
* Improvements to *_app._getConnection methods suggested by
diff --git a/flup/server/threadedserver.py b/flup/server/threadedserver.py
index 628db78..0471ed3 100644
--- a/flup/server/threadedserver.py
+++ b/flup/server/threadedserver.py
@@ -105,7 +105,8 @@ class ThreadedServer(object):
self._mainloopPeriodic()
# Restore signal handlers.
- self._restoreSignalHandlers()
+ if not sys.platform.startswith('win'):
+ self._restoreSignalHandlers()
# Return bool based on whether or not SIGHUP was received.
return self._hupReceived