Changeset 1899

Timestamp:

02/21/08 12:43:30

Author:

fumanchu

Message:

Test and potential fix for #790 (Request body of PUT with no Content-Type is parsed incorrectly). It doesn't actually pass yet, but I suspect that's a problem with httplib or something else in between (but I've spent an hour and can't seem to track it down).

Files:

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

trunk/cherrypy/_cprequest.py

@@ -686 +686 @@
-        methenv = {'REQUEST_METHOD': "POST"}
-        try:
+            # If the headers are missing "Content-Type" then add one
+            # with an empty value.  This ensures that FieldStorage
+            # won't parse the request body for params if the client
+            # didn't provide a "Content-Type" header.
+            if 'Content-Type' not in self.headers:
+                h = self.headers.copy()
+                h['Content-Type'] = 'application/octet-stream'
+            else:
+                h = self.headers
+            
-            forms = _cpcgifs.FieldStorage(fp=self.rfile,
-self.headers
+h
-                                          environ=methenv,
-                                          keep_blank_values=1)

trunk/cherrypy/test/test_core.py

@@ -3 +3 @@
-from cherrypy.test import test
-test.prefer_parent_path()
+
+import os
+localDir = os.path.dirname(__file__)
+import types
-
-import cherrypy
-from cherrypy import _cptools, tools
-from cherrypy.lib import http, static
-
-
-
-
+
+
-log_file = os.path.join(localDir, "test.log")
-log_access_file = os.path.join(localDir, "access.log")
@@ -927 +929 @@
-        self.assertBody(b)
-        
+        # Request a PUT method with a file body but no Content-Type.
+        # See http://www.cherrypy.org/ticket/790.
+        b = "one thing on top of another"
+        self.persistent = True
+        try:
+            conn = self.HTTP_CONN
+##            conn.set_debuglevel(10)
+            conn.putrequest("PUT", "/method/request_body", skip_host=True)
+            conn.putheader("Host", self.HOST)
+            conn.putheader('Content-Length', str(len(b)))
+            conn.endheaders()
+            conn.send(b)
+            response = conn.response_class(conn.sock, method="PUT")
+            response.begin()
+            self.assertEqual(response.status, 200)
+            self.body = response.read()
+            self.assertBody(b)
+        finally:
+            self.persistent = False
+        
-        # Request a PUT method with no body whatsoever (not an empty one).
-        # See http://www.cherrypy.org/ticket/650.