Changeset 1257

Timestamp:

08/20/06 21:54:14

Author:

fumanchu

Message:

Better support for Expect/100 Continue.

Files:

• trunk/cherrypy/_cpwsgi.py (modified) (1 diff)
• trunk/cherrypy/_cpwsgiserver.py (modified) (7 diffs)
• trunk/cherrypy/test/test_conn.py (modified) (4 diffs)
• trunk/cherrypy/test/webtest.py (modified) (3 diffs)

trunk/cherrypy/_cpwsgi.py

@@ -128 +128 @@
-            _cpwsgiserver.HTTPRequest.parse_request(self)
-        except http.MaxSizeExceeded:
-abort
+simple_response
-            cherrypy.log(traceback=True)
-

trunk/cherrypy/_cpwsgiserver.py

@@ -54 +54 @@
-            request_line = self.rfile.readline()
-        except socket.timeout:
-
+
+
-        
-        if not request_line:
@@ -95 +96 @@
-                break
-        else:
-abort
+simple_response
-            return
-        
@@ -117 +118 @@
-        sp = int(server.protocol[5]), int(server.protocol[7])
-        if sp[0] != rp[0]:
-abort
+simple_response
-            return
-        self.environ["SERVER_PROTOCOL"] = "HTTP/%s.%s" % min(rp, sp)
@@ -136 +137 @@
-            # encoding, always respond with 411 Length Required.
-            # See http://www.cherrypy.org/ticket/493.
-abort
+simple_response
-            return
-        self.environ["CONTENT_LENGTH"] = cl or ""
@@ -158 +159 @@
-                self.close_connection = True
-        
+        # From PEP 333:
+        # "Servers and gateways that implement HTTP 1.1 must provide
+        # transparent support for HTTP 1.1's "expect/continue" mechanism.
+        # This may be done in any of several ways:
+        #   1. Respond to requests containing an Expect: 100-continue request
+        #      with an immediate "100 Continue" response, and proceed normally.
+        #   2. Proceed with the request normally, but provide the application
+        #      with a wsgi.input stream that will send the "100 Continue"
+        #      response if/when the application first attempts to read from
+        #      the input stream. The read request must then remain blocked
+        #      until the client responds.
+        #   3. Wait until the client decides that the server does not support
+        #      expect/continue, and sends the request body on its own.
+        #      (This is suboptimal, and is not recommended.)
+        #
+        # We used to do 3, but are now doing 1. Maybe we'll do 2 someday,
+        # but it seems like it would be a big slowdown for such a rare case.
+        if headers.getheader("Expect", "") == "100-continue":
+            self.simple_response(100)
+        
-        self.ready = True
-    
@@ -168 +189 @@
-        self.terminate()
-    
-abort
-error messag
+simple_response
+respons
-        status = str(status)
-        wfile = self.connection.wfile
@@ -184 +205 @@
-            wfile.write(msg)
-        wfile.flush()
-        self.ready = False
-    
-    def start_response(self, status, headers, exc_info = None):

trunk/cherrypy/test/test_conn.py

@@ -6 +6 @@
-
-import cherrypy
+from cherrypy.test import webtest
-
-
@@ -29 +30 @@
-        stream.exposed = True
-        stream._cp_config = {'stream_response': True}
+        
+        def upload(self):
+            return "thanks for the %s bytes!" % len(cherrypy.request.body.read())
+        upload.exposed = True
-    
-    cherrypy.tree.mount(Root())
@@ -111 +116 @@
-        conn.close()
-    
+    def test_100_Continue(self):
+        conn = httplib.HTTPConnection(self.HOST, self.PORT)
+        conn.auto_open = False
+        conn.connect()
+        
+        # Try a page without an Expect request header first.
+        # Note that httplib's response.begin automatically ignores
+        # 100 Continue responses, so we must manually check for it.
+        conn.putrequest("POST", "/upload", skip_host=True)
+        conn.putheader("Host", self.HOST)
+        conn.putheader("Content-Type", "text/plain")
+        conn.putheader("Content-Length", "4")
+        conn.endheaders()
+        conn.send("d'oh")
+        response = conn.response_class(conn.sock, method="POST")
+        version, status, reason = response._read_status()
+        self.assertNotEqual(status, 100)
+        conn.close()
+        
+        # Now try a page with an Expect header...
+        conn.connect()
+        conn.putrequest("POST", "/upload", skip_host=True)
+        conn.putheader("Host", self.HOST)
+        conn.putheader("Content-Type", "text/plain")
+        conn.putheader("Content-Length", "17")
+        conn.putheader("Expect", "100-continue")
+        conn.endheaders()
+        response = conn.response_class(conn.sock, method="POST")
+        
+        # ...assert and then skip the 100 response
+        version, status, reason = response._read_status()
+        self.assertEqual(status, 100)
+        while True:
+            skip = response.fp.readline().strip()
+            if not skip:
+                break
+        
+        # ...send the body
+        conn.send("I am a small file")
+        
+        # ...get the final response
+        response.begin()
+        self.status, self.headers, self.body = webtest.shb(response)
+        self.assertStatus(200)
+        self.assertBody("thanks for the 17 bytes!")
+    
-    def test_HTTP10(self):
-1
+0
-        self.HTTP_CONN = httplib.HTTPConnection
-        
-        # Test a normal HTTP/1.0 request.
-, protocol="HTTP/1.0"
+
-        self.assertStatus('200 OK')
-        self.assertBody(pov)
@@ -123 +174 @@
-        # Test a keep-alive HTTP/1.0 request.
-        self.HTTP_CONN = httplib.HTTPConnection(self.HOST, self.PORT)
-
-
+
+
+
+
-        self.assertStatus('200 OK')
-        self.assertBody(pov)
-        self.assertHeader("Connection", "Keep-Alive")
-        
-Test a keep-alive HTTP/1.0 request
-, protocol="HTTP/1.0"
+Remove the keep-alive header again
+
-        self.assertStatus('200 OK')
-        self.assertBody(pov)

trunk/cherrypy/test/webtest.py

@@ -356 +356 @@
-
-
+def shb(response):
+    """Return status, headers, body the way we like from a response."""
+    h = []
+    key, value = None, None
+    for line in response.msg.headers:
+        if line:
+            if line[0] in " \t":
+                value += line.strip()
+            else:
+                if key and value:
+                    h.append((key, value))
+                key, value = line.split(":", 1)
+                key = key.strip()
+                value = value.strip()
+    if key and value:
+        h.append((key, value))
+    
+    return "%s %s" % (response.status, response.reason), h, response.read()
+
+
-def openURL(url, headers=None, method="GET", body=None,
-            host="127.0.0.1", port=8000, http_conn=httplib.HTTPConnection,
@@ -394 +414 @@
-            response = conn.getresponse()
-            
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-            
-            if not hasattr(http_conn, "host"):
@@ -417 +420 @@
-                conn.close()
-            
-tatus, outheaders, outbody
+, h, b
-        except socket.error:
-            trial += 1