[Zope-Checkins] CVS: Packages/OFS - Image.py:1.145.2.12

[Chris McDonough]

Update of /cvs-repository/Packages/OFS
In directory cvs.zope.org:/tmp/cvs-serv2373

Modified Files:
      Tag: Zope-2_7-branch
	Image.py 
Log Message:
Collector http://www.zope.org/Collectors/Zope/1797 : 304 responses require collaboration from http accelerated cache manager.  (see also http://www.zope.org/Collectors/Zope/683).


=== Packages/OFS/Image.py 1.145.2.11 => 1.145.2.12 ===
--- Packages/OFS/Image.py:1.145.2.11	Thu Jan 27 13:47:11 2005
+++ Packages/OFS/Image.py	Fri Jun  3 12:15:00 2005
@@ -364,6 +364,12 @@
 
         if self._if_modified_since_request_handler(REQUEST, RESPONSE):
             # we were able to handle this by returning a 304
+            # unfortunately, because the HTTP cache manager uses the cache
+            # API, and because 304 responses are required to carry the Expires
+            # header for HTTP/1.1, we need to call ZCacheable_set here.
+            # This is nonsensical for caches other than the HTTP cache manager
+            # unfortunately.
+            self.ZCacheable_set(None)
             return ''
 
         if self.precondition and hasattr(self, str(self.precondition)):