Ticket #16: flup_timeout_patch_r2347.diff

server/scgi_base.py

@@ -37 +37 @@
-import datetime
-import os
-import warnings
-
+
-# Threads are required. If you want a non-threaded (forking) version, look at
-# SWAP <http://www.idyll.org/~t/www-tools/wsgi/>.
-import thread
@@ -198 +198 @@
-                          handlerTime.seconds +
-                          handlerTime.microseconds / 1000000.0)
-
+class TimeoutException(Exception):
+    pass
-class Connection(object):
-    """
-    Represents a single client (web server) connection. A single request
-    is handled, after which the socket is closed.
-    """
-
+, timeout
-        self._sock = sock
-        self._addr = addr
-        self.server = server
+        self._timeout = timeout
-
-        self.logger = logging.getLogger(LoggerName)
-
+    def timeout_handler(self, signum, frame):
+        self.logger.error('Timeout Exceeded')
+        self.logger.error("\n".join(traceback.format_stack(frame)))
+
+        raise TimeoutException
+
-    def run(self):
-        if len(self._addr) == 2:
-            self.logger.debug('Connection starting up (%s:%d)',
@@ -264 +273 @@
-        # Allocate Request
-        req = Request(self, environ, input, output)
-
+        # If there is a timeout
+        if self._timeout:
+            old_alarm = signal.signal(signal.SIGALRM, self.timeout_handler)
+            signal.alarm(self._timeout)
+            
-        # Run it.
-        req.run()
-
-        output.close()
-        input.close()
-
+        # Restore old handler if timeout was given
+        if self._timeout:
+            signal.signal(signal.SIGALRM, old_alarm)
+            
+
+
-class BaseSCGIServer(object):
-    # What Request class to use.
-    requestClass = Request

server/scgi.py

@@ -131 +131 @@
-        for key in ('jobClass', 'jobArgs'):
-            if kw.has_key(key):
-                del kw[key]
-
+None
-                                **kw)
-
-    def run(self):

server/scgi_fork.py

@@ -90 +90 @@
-    def __init__(self, application, scriptName=NoDefault, environ=None,
-                 bindAddress=('localhost', 4000), umask=None,
-                 allowedServers=None,
-
+timeout=None, 
-        """
-        scriptName is the initial portion of the URL path that "belongs"
-        to your application. It is used to determine PATH_INFO (which doesn't
@@ -130 +130 @@
-        for key in ('multithreaded', 'multiprocess', 'jobClass', 'jobArgs'):
-            if kw.has_key(key):
-                del kw[key]
-
+
+
-
-    def run(self):
-        """