Changeset 1569

Timestamp:

12/28/06 13:53:28

Author:

fumanchu

Message:

2.x backport of RFC-2047 header encoding/decoding (see [1166] et al).

Files:

• branches/cherrypy-2.x/cherrypy/_cphttptools.py (modified) (2 diffs)
• branches/cherrypy-2.x/cherrypy/lib/httptools.py (modified) (4 diffs)
• branches/cherrypy-2.x/cherrypy/test/test.py (modified) (1 diff)
• branches/cherrypy-2.x/cherrypy/test/test_core.py (modified) (2 diffs)

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

@@ -196 +196 @@
-            # only Konqueror does that), only the last one will remain in headers
-            # (but they will be correctly stored in request.simple_cookie).
-value
+httptools.decode_TEXT(value)
-            
-            # Handle cookies differently because on Konqueror, multiple
@@ -427 +427 @@
-        
-        # Transform our header dict into a sorted list of tuples.
-
+protocol=self.version
-        
-        cookie = self.simple_cookie.output()

branches/cherrypy-2.x/cherrypy/lib/httptools.py

@@ -17 +17 @@
-
-import cgi
+from email.Header import Header, decode_header
-import re
-import time
@@ -262 +263 @@
-    return result
-
+def decode_TEXT(value):
+    """Decode RFC-2047 TEXT (e.g. "=?utf-8?q?f=C3=BCr?=" -> u"f\xfcr")."""
+    atoms = decode_header(value)
+    decodedvalue = ""
+    for atom, charset in atoms:
+        if charset is not None:
+            atom = atom.decode(charset)
+        decodedvalue += atom
+    return decodedvalue
-
-def validStatus(status):
@@ -453 +463 @@
-        order_map[_] = 2
-    
-
+, protocol=(1, 0)
-        """Transform self into a sorted list of (name, value) tuples.
-        
@@ -467 +477 @@
-            if not isinstance(valueList, list):
-                valueList = [valueList]
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        header_list.sort()
-        return [item[1] for item in header_list]

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

@@ -92 +92 @@
-        self.protocol = "HTTP/1.1"
-        
-1
+0
-                    'basedir=', 'port=', 'server=']
-        longopts.extend(self.available_tests)

branches/cherrypy-2.x/cherrypy/test/test_core.py

@@ -266 +266 @@
-            
-            return "double header test"
-
-
+
+
+
+
+
+
+
-    class HeaderElements(Test):
-        
@@ -773 +778 @@
-                    'Expires', 'Location', 'Server']:
-            self.assertEqual(hnames.count(key), 1)
+        
+        if cherrypy.config.get('server.protocol_version') == "HTTP/1.1":
+            # Test RFC-2047-encoded request and response header values
+            c = "=E2=84=ABngstr=C3=B6m"
+            self.getPage("/headers/ifmatch", [('If-Match', '=?utf-8?q?%s?=' % c)])
+            self.assertBody("u'\\u212bngstr\\xf6m'")
+            self.assertHeader("ETag", '=?utf-8?b?4oSrbmdzdHLDtm0=?=')
+            
+            # Test a *LONG* RFC-2047-encoded request and response header value
+            self.getPage("/headers/ifmatch",
+                         [('If-Match', '=?utf-8?q?%s?=' % (c * 10))])
+            self.assertBody("u'%s'" % ('\\u212bngstr\\xf6m' * 10))
+            self.assertHeader("ETag",
+                              '=?utf-8?b?4oSrbmdzdHLDtm3ihKtuZ3N0csO2beKEq25nc3Ryw7Zt4oSrbmdzdHLDtm0=?='
+                              '=?utf-8?b?4oSrbmdzdHLDtm3ihKtuZ3N0csO2beKEq25nc3Ryw7Zt4oSrbmdzdHLDtm0=?='
+                              '=?utf-8?b?4oSrbmdzdHLDtm3ihKtuZ3N0csO2bQ==?=')
-    
-    def testHTTPMethods(self):