Changeset 1521

Timestamp:

12/11/06 15:22:15

Author:

fumanchu

Message:

2.x partial backport of [1406] (Fix for #588 (CherryPyWSGIServer sends Connection: close during 204 and 304 responses)).

Files:

• branches/cherrypy-2.x/cherrypy/_cphttptools.py (modified) (1 diff)

branches/cherrypy-2.x/cherrypy/_cphttptools.py

@@ -413 +413 @@
-            except KeyError:
-                pass
+        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."
+            self.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()
-                self.headers['Content-Length'] = len(content)