Changeset 1790
- Timestamp:
- 10/27/07 23:14:47
- Files:
-
- trunk/cherrypy/lib/caching.py (modified) (2 diffs)
- trunk/cherrypy/test/test_caching.py (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/cherrypy/lib/caching.py
r1771 r1790 176 176 expire. The 'Expires' header will be set to (response.time + secs). 177 177 178 If 'secs' is zero, the following "cache prevention" headers are also set: 178 If 'secs' is zero, the 'Expires' header is set one year in the past, and 179 the following "cache prevention" headers are also set: 179 180 'Pragma': 'no-cache' 180 181 'Cache-Control': 'no-cache, must-revalidate' … … 206 207 if force or "Cache-Control" not in headers: 207 208 headers["Cache-Control"] = "no-cache, must-revalidate" 208 209 expiry = http.HTTPDate(response.time + secs) 209 # Set an explicit Expires date in the past. 210 expiry = http.HTTPDate(1169942400.0) 211 else: 212 expiry = http.HTTPDate(response.time + secs) 210 213 if force or "Expires" not in headers: 211 214 headers["Expires"] = expiry trunk/cherrypy/test/test_caching.py
r1771 r1790 142 142 if cherrypy.server.protocol_version == "HTTP/1.1": 143 143 self.assertHeader("Cache-Control", "no-cache, must-revalidate") 144 d = self.assertHeader("Date") 145 self.assertHeader("Expires", d) 144 self.assertHeader("Expires", "Sun, 28 Jan 2007 00:00:00 GMT") 146 145 147 146 # static content should now have "cache prevention" headers … … 151 150 if cherrypy.server.protocol_version == "HTTP/1.1": 152 151 self.assertHeader("Cache-Control", "no-cache, must-revalidate") 153 d = self.assertHeader("Date") 154 self.assertHeader("Expires", d) 152 self.assertHeader("Expires", "Sun, 28 Jan 2007 00:00:00 GMT") 155 153 156 154 # the cacheable handler should now have "cache prevention" headers … … 160 158 if cherrypy.server.protocol_version == "HTTP/1.1": 161 159 self.assertHeader("Cache-Control", "no-cache, must-revalidate") 162 d = self.assertHeader("Date") 163 self.assertHeader("Expires", d) 160 self.assertHeader("Expires", "Sun, 28 Jan 2007 00:00:00 GMT") 164 161 165 162 self.getPage('/expires/dynamic') … … 170 167 if cherrypy.server.protocol_version == "HTTP/1.1": 171 168 self.assertHeader("Cache-Control", "no-cache, must-revalidate") 172 d = self.assertHeader("Date") 173 self.assertHeader("Expires", d) 169 self.assertHeader("Expires", "Sun, 28 Jan 2007 00:00:00 GMT") 174 170 175 171 def testLastModified(self):
