summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--flup/server/threadedserver.py6
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index db1bb01..1132856 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-26 Allan Saddi <asaddi@europa.saddi.net>
+
+ * Don't attempt to install signal handlers under Windows
+ to improve compatibility.
+
2006-11-24 Allan Saddi <asaddi@europa.saddi.net>
* Add *_thread egg entry-point aliases.
diff --git a/flup/server/threadedserver.py b/flup/server/threadedserver.py
index c2d0e04..bf08f52 100644
--- a/flup/server/threadedserver.py
+++ b/flup/server/threadedserver.py
@@ -27,6 +27,7 @@
__author__ = 'Allan Saddi <allan@saddi.com>'
__version__ = '$Revision$'
+import sys
import socket
import select
import signal
@@ -61,7 +62,10 @@ class ThreadedServer(object):
# Set up signal handlers.
self._keepGoing = True
self._hupReceived = False
- self._installSignalHandlers()
+
+ # Might need to revisit this?
+ if not sys.platform.startswith('win'):
+ self._installSignalHandlers()
# Set close-on-exec
setCloseOnExec(sock)