Changeset 1562

Timestamp:

12/23/06 13:37:35

Author:

fumanchu

Message:

wsgiserver: Moved 'bind' inner func out to method so subclasses can override socket options more easily.

Files:

• trunk/cherrypy/test/benchmark.py (modified) (1 diff)
• trunk/cherrypy/wsgiserver.py (modified) (3 diffs)

trunk/cherrypy/test/benchmark.py

@@ -85 +85 @@
-    'server.max_request_header_size': 0,
-    'server.max_request_body_size': 0,
+    'engine.deadlock_poll_freq': 0,
-    # Cheat mode on ;)
-    'tools.log_tracebacks.on': False,

trunk/cherrypy/wsgiserver.py

@@ -748 +748 @@
-        # trap those exceptions in whatever code block calls start().
-        self._interrupt = None
-        
-        def bind(family, type, proto=0):
-            """Create (or recreate) the actual socket object."""
-            self.socket = socket.socket(family, type, proto)
-            self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-            if self.ssl_certificate and self.ssl_private_key:
-                if SSL is None:
-                    raise ImportError("You must install pyOpenSSL to use HTTPS.")
-                
-                # See http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/442473
-                ctx = SSL.Context(SSL.SSLv23_METHOD)
-                ctx.use_privatekey_file(self.ssl_private_key)
-                ctx.use_certificate_file(self.ssl_certificate)
-                self.socket = SSLConnection(ctx, self.socket)
-                self.populate_ssl_environ()
-            self.socket.bind(self.bind_addr)
-        
-        # Select the appropriate socket
@@ -806 +790 @@
-            af, socktype, proto, canonname, sa = res
-            try:
-
+self.
-            except socket.error, msg:
-                if self.socket:
@@ -838 +822 @@
-                    time.sleep(0.1)
-                raise self.interrupt
+    
+    def bind(self, family, type, proto=0):
+        """Create (or recreate) the actual socket object."""
+        self.socket = socket.socket(family, type, proto)
+        self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+##        self.socket.setsockopt(socket.SOL_SOCKET, socket.TCP_NODELAY, 1)
+        if self.ssl_certificate and self.ssl_private_key:
+            if SSL is None:
+                raise ImportError("You must install pyOpenSSL to use HTTPS.")
+            
+            # See http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/442473
+            ctx = SSL.Context(SSL.SSLv23_METHOD)
+            ctx.use_privatekey_file(self.ssl_private_key)
+            ctx.use_certificate_file(self.ssl_certificate)
+            self.socket = SSLConnection(ctx, self.socket)
+            self.populate_ssl_environ()
+        self.socket.bind(self.bind_addr)
-    
-    def tick(self):