Changeset 320

Timestamp:

06/16/05 01:53:37

Author:

fumanchu

Message:

Fix and test for ticket #165 (header case-sensitivity).

Files:

• trunk/cherrypy/_cphttptools.py (modified) (3 diffs)
• trunk/cherrypy/test/helper.py (modified) (1 diff)
• trunk/cherrypy/test/test_core.py (modified) (2 diffs)

trunk/cherrypy/_cphttptools.py

@@ -50 +50 @@
-
-
+class KeyTitlingDict(dict):
+    """dict subclass which changes each key to str(key).title()
+    
+    This should allow response headers to be case-insensitive and
+    avoid duplicates.
+    """
+    
+    def __getitem__(self, key):
+        return dict.__getitem__(self, str(key).title())
+    
+    def __setitem__(self, key, value):
+        dict.__setitem__(self, str(key).title(), value)
+    
+    def __delitem__(self, key, value):
+        dict.__delitem__(self, str(key).title(), value)
+    
+    def __contains__(self, item):
+        return dict.__contains__(self, str(item).title())
+    
+    def get(self, key, default=None):
+        return dict.get(self, str(key).title(), default)
+    
+    def has_key(self, key):
+        return dict.has_key(self, str(key).title())
+    
+    def update(self, E):
+        for k in E.keys():
+            self[str(k).title()] = E[k]
+    
+    def fromkeys(cls, seq, value=None):
+        newdict = cls()
+        for k in seq:
+            newdict[str(k).title()] = value
+        return newdict
+    fromkeys = classmethod(fromkeys)
+    
+    def setdefault(key, x=None):
+        key = str(key).title()
+        try:
+            return self[key]
+        except KeyError:
+            self[key] = x
+            return x
+    
+    def pop(self, key, default):
+        return dict.pop(self, str(key).title(), default)
+
+
-class Request(object):
-    """Process a request and yield a series of response chunks.
@@ -87 +135 @@
-        date = ("%s, %02d %3s %4d %02d:%02d:%02d GMT" %
-                (weekdayname[wd], day, monthname[month], year, hh, mm, ss))
-
+
+
-            "Content-Type": "text/html",
-            "Server": "CherryPy/" + cpg.__version__,
@@ -93 +142 @@
-            "Set-Cookie": [],
-            "Content-Length": 0
-
+)
-        cpg.response.simpleCookie = Cookie.SimpleCookie()
-        

trunk/cherrypy/test/helper.py

@@ -105 +105 @@
-                key, value = line.split(":", 1)
-                cpg.response.headerMap[key.strip()] = value.strip()
-
+
+
-            
-            cpg.response.body = response.read()

trunk/cherrypy/test/test_core.py

@@ -119 +119 @@
-            yield "oops"
-        return inner()
+
+
+class Headers(Test):
+    
+    def index(self):
+        # From http://www.cherrypy.org/ticket/165:
+        # "header field names should not be case sensitive sayes the rfc.
+        # if i set a headerfield in complete lowercase i end up with two
+        # header fields, one in lowercase, the other in mixed-case."
+        
+        # Set the most common headers
+        cpg.response.headerMap['content-type'] = "text/html"
+        cpg.response.headerMap['content-length'] = 18
+        cpg.response.headerMap['server'] = 'CherryPy headertest'
+        cpg.response.headerMap['location'] = 'http://127.0.0.1:8000/headers/'
+        
+        # Set a rare header for fun
+        cpg.response.headerMap['Expires'] = 'Thu, 01 Dec 2194 16:00:00 GMT'
+        
+        return "double header test"
-
-
@@ -215 +235 @@
-            self.assertEqual(cpg.response.status, "200 OK")
-            self.assertEqual(cpg.response.body, "helloUnrecoverable error in the server.")
+    
+    def testHeaderCaseSensitivity(self):
+        helper.request("/headers/")
+        hnames = [name.title() for name, val in cpg.response.headers]
+        hnames.sort()
+        self.assertEqual(hnames, ['Content-Length', 'Content-Type', 'Date', 'Expires',
+                                  'Location', 'Server'])
+        self.assertEqual(cpg.response.body, "double header test")
-
-