Changeset 1406

Timestamp:

10/21/06 22:36:38

Author:

fumanchu

Message:

Fix for #588 (CherryPyWSGIServer sends Connection: close during 204 and 304 responses).

Files:

• trunk/cherrypy/_cprequest.py (modified) (1 diff)
• trunk/cherrypy/_cpwsgiserver.py (modified) (1 diff)
• trunk/cherrypy/test/test_conn.py (modified) (2 diffs)

trunk/cherrypy/_cprequest.py

@@ -607 +607 @@
-        if self.stream:
-            headers.pop('Content-Length', None)
+        elif code < 200 or code in (204, 304):
+            # "All 1xx (informational), 204 (no content),
+            # and 304 (not modified) responses MUST NOT
+            # include a message-body."
+            headers.pop('Content-Length', None)
+            self.body = ""
-        else:
-            # Responses which are not streamed should have a Content-Length,
-            # but allow user code to set Content-Length if desired.
-
-
+
-                content = self.collapse_body()
-                dict.__setitem__(headers, 'Content-Length', len(content))

trunk/cherrypy/_cpwsgiserver.py

@@ -320 +320 @@
-        hkeys = [key.lower() for (key,value) in self.outheaders]
-        
+        status = int(self.status[:3])
-        if (self.response_protocol == 'HTTP/1.1'
-            and (# Request Entity Too Large. Close conn to avoid garbage.
-elf.status[:3] == "413"
+tatus == 413
-                # No Content-Length. Close conn to determine transfer-length.
-
+
+
+
+
+
-            if "connection" not in hkeys:
-                self.outheaders.append(("Connection", "close"))

trunk/cherrypy/test/test_conn.py

@@ -38 +38 @@
-                     cherrypy.request.headers['Content-Type']))
-        upload.exposed = True
+        
+        def custom(self, response_code):
+            cherrypy.response.status = response_code
+            return "Code = %s" % response_code
+        custom.exposed = True
-    
-    cherrypy.tree.mount(Root())
@@ -292 +297 @@
-        self.assertBody("thanks for 'I am a small file' (text/plain)")
-    
+    def test_No_Message_Body(self):
+        if cherrypy.server.protocol_version != "HTTP/1.1":
+            print "skipped ",
+            return
+        
+        self.PROTOCOL = "HTTP/1.1"
+        
+        # Set our HTTP_CONN to an instance so it persists between requests.
+        if self.scheme == "https":
+            self.HTTP_CONN = httplib.HTTPSConnection(self.HOST, self.PORT)
+        else:
+            self.HTTP_CONN = httplib.HTTPConnection(self.HOST, self.PORT)
+        # Don't automatically re-connect
+        self.HTTP_CONN.auto_open = False
+        self.HTTP_CONN.connect()
+        
+        # Make the first request and assert there's no "Connection: close".
+        self.getPage("/")
+        self.assertStatus('200 OK')
+        self.assertBody(pov)
+        self.assertNoHeader("Connection")
+        
+        # Make a 204 request on the same connection.
+        self.getPage("/custom/204")
+        self.assertStatus(204)
+        self.assertNoHeader("Content-Length")
+        self.assertBody("")
+        self.assertNoHeader("Connection")
+        
+        # Make a 304 request on the same connection.
+        self.getPage("/custom/304")
+        self.assertStatus(304)
+        self.assertNoHeader("Content-Length")
+        self.assertBody("")
+        self.assertNoHeader("Connection")
+    
-    def test_Chunked_Encoding(self):
-        if cherrypy.server.protocol_version != "HTTP/1.1":