Changeset 1207

Timestamp:

07/24/06 22:10:26

Author:

fumanchu

Message:

Test and fix for bug in expires tool.

Files:

• trunk/cherrypy/lib/caching.py (modified) (2 diffs)
• trunk/cherrypy/test/test_caching.py (modified) (1 diff)

trunk/cherrypy/lib/caching.py

@@ -186 +186 @@
-        secs = (86400 * secs.days) + secs.seconds
-    expiry = http.HTTPDate(cherrypy.response.time + secs)
-    cptools.response_headers([("Expires", expiry)], force)
-    
-    if secs == 0:
@@ -200 +199 @@
-            if cherrypy.request.version >= (1, 1):
-                cptools.response_headers([("Cache-Control", "no-cache")], force)
+    
+    # Set after Pragma, Cache-Control so it doesn't interfere with 'indicators'
+    cptools.response_headers([("Expires", expiry)], force)

trunk/cherrypy/test/test_caching.py

@@ -123 +123 @@
-        self.getPage("/expires/force")
-        self.assertStatus("200 OK")
+        # This also gives us a chance to test 0 expiry with no other headers
+        self.assertHeader("Pragma", "no-cache")
+        self.assertHeader("Cache-Control", "no-cache")
+        d = self.assertHeader("Date")
+        self.assertHeader("Expires", d)
-        
-        # static content should now have "cache prevention" headers