Changeset 1208

Timestamp:

08/02/06 23:38:53

Author:

fumanchu

Message:

If not cacheable, we shouldn't even set Expires.

Files:

• trunk/cherrypy/lib/caching.py (modified) (1 diff)

trunk/cherrypy/lib/caching.py

@@ -180 +180 @@
-    If 'force' is False (the default), the following headers are checked:
-    'Etag', 'Last-Modified', 'Age', 'Expires'. If any are already present,
-"cache prevention"
+above response
-    """
-    
-if isinstance(secs, datetime.timedelta):
-    secs = (86400 * secs.days) + secs.seconds
-expiry = http.HTTPDate(cherrypy.response.time + secs)
-
-if secs == 0
-cacheable = Fals
-if not force:
-        # some header names that indicate that the response can be cached
-        for indicator in ('Etag', 'Last-Modified', 'Age', 'Expires')
-        if indicator in cherrypy.response.headers
-        cacheable = True
-            break
-not cacheable
+cacheable = False
+if not force:
+    # some header names that indicate that the response can be cached
+    for indicator in ('Etag', 'Last-Modified', 'Age', 'Expires'):
+        if indicator in cherrypy.response.headers
+        cacheable = Tru
+        break
+
+if not cacheable
+if isinstance(secs, datetime.timedelta)
+secs = (86400 * secs.days) + secs.seconds
+
+secs == 0
-            cptools.response_headers([("Pragma", "no-cache")], force)
-            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'
-
+    
+    expiry = http.HTTPDate(cherrypy.response.time + secs)
+