Changeset 356

Timestamp:

06/22/05 00:01:47

Author:

fumanchu

Message:

Implements ticket #172 (order response headers).

Files:

• trunk/cherrypy/_cphttptools.py (modified) (2 diffs)
• trunk/cherrypy/test/test_tutorials.py (modified) (previous)

trunk/cherrypy/_cphttptools.py

@@ -368 +368 @@
-    return cpg.response.status
-
+
+general_header_fields = ["Cache-Control", "Connection", "Date", "Pragma",
+                         "Trailer", "Transfer-Encoding", "Upgrade", "Via",
+                         "Warning"]
+response_header_fields = ["Accept-Ranges", "Age", "ETag", "Location",
+                          "Proxy-Authenticate", "Retry-After", "Server",
+                          "Vary", "WWW-Authenticate"]
+entity_header_fields = ["Allow", "Content-Encoding", "Content-Language",
+                        "Content-Length", "Content-Location", "Content-MD5",
+                        "Content-Range", "Content-Type", "Expires",
+                        "Last-Modified"]
+
+_header_order_map = {}
+for _ in general_header_fields:
+    _header_order_map[_] = 0
+for _ in response_header_fields:
+    _header_order_map[_] = 1
+for _ in entity_header_fields:
+    _header_order_map[_] = 2
+
+
-def finalize():
-    """Transform headerMap + cookies into cpg.response.headers."""
@@ -380 +401 @@
-    
-    # Headers
-cpg.response.
+
-    for key, valueList in cpg.response.headerMap.iteritems():
+        order = _header_order_map.get(key, 3)
-        if not isinstance(valueList, list):
-            valueList = [valueList]
-        for value in valueList:
-
+
+
+
+
+
+
-    
-    cookie = cpg.response.simpleCookie.output()