Changeset 1549

Timestamp:

12/21/06 14:46:12

Author:

fumanchu

Message:

wsgiserver: comments, gave HTTPRequest a 'wfile' attr, and now ignore only a single leading CRLF.

Files:

• trunk/cherrypy/wsgiserver.py (modified) (8 diffs)

trunk/cherrypy/wsgiserver.py

@@ -108 +108 @@
-        self.connection = connection
-        self.rfile = self.connection.rfile
+        self.wfile = self.connection.wfile
-        self.environ = connection.environ.copy()
-        
@@ -127 +128 @@
-        # (although your TCP stack might suffer for it: cf Apache's history
-        # with FIN_WAIT_2).
-
+
+
+
+
+
+
+
+
+
+
+
-            request_line = self.rfile.readline()
-            if not request_line:
-                # Force self.ready = False so the connection will close.
-                self.ready = False
-                return
-            elif request_line == "\r\n":
-                # "...if the server is reading the protocol stream at the
-                # beginning of a message and receives a CRLF first, it
-                # should ignore the CRLF." RFC 2616 sec 4.1
-                pass
-            else:
-                break
-        
-        server = self.connection.server
@@ -333 +336 @@
-                return
-        
+        # Grab any trailer headers
-        headers = mimetools.Message(self.rfile)
-        self.environ.update(self.parse_headers(headers))
+        
-        data.seek(0)
-        self.environ["wsgi.input"] = data
@@ -342 +347 @@
-    def respond(self):
-        """Call the appropriate WSGI app and write its iterable output."""
-connection.
+
-        response = self.wsgi_app(self.environ, self.start_response)
-        try:
@@ -361 +366 @@
-        """Write a simple response back to the client."""
-        status = str(status)
-connection.
+
-        wfile.write("%s %s\r\n" % (self.connection.server.protocol, status))
-        wfile.write("Content-Length: %s\r\n" % len(msg))
@@ -399 +404 @@
-            self.sent_headers = True
-            self.send_headers()
-connection.
+
-        if self.chunked_write:
-            wfile.write(hex(len(chunk))[2:])
@@ -437 +442 @@
-        
-        server = self.connection.server
-connection.
+
-        
-        if "server" not in hkeys:
@@ -465 +470 @@
-                return method(self, *args, **kwargs)
-            except (SSL.WantReadError, SSL.WantWriteError):
-
+
+
+
+
-                time.sleep(self.ssl_retry)
-            except SSL.SysCallError, e: