[Zope-Checkins] CVS: Zope/lib/python/OFS - Image.py:1.141.4.3
Andy McKay
andy@agmweb.ca
Mon, 16 Dec 2002 19:40:23 -0500
Update of /cvs-repository/Zope/lib/python/OFS
In directory cvs.zope.org:/tmp/cvs-serv2993/lib/python/OFS
Modified Files:
Tag: Zope-2_6-branch
Image.py
Log Message:
Check in for #342 on behalf of slinkp
=== Zope/lib/python/OFS/Image.py 1.141.4.2 => 1.141.4.3 ===
--- Zope/lib/python/OFS/Image.py:1.141.4.2 Wed Nov 13 14:18:41 2002
+++ Zope/lib/python/OFS/Image.py Mon Dec 16 19:40:23 2002
@@ -133,6 +133,7 @@
Returns the contents of the file or image. Also, sets the
Content-Type HTTP header to the objects content type.
"""
+
# HTTP If-Modified-Since header handling.
header=REQUEST.get_header('If-Modified-Since', None)
if header is not None:
@@ -374,7 +375,9 @@
self.ZCacheable_set(None)
data=self.data
- if type(data) is type(''): return data
+ if type(data) is type(''):
+ RESPONSE.setBase(None)
+ return data
while data is not None:
RESPONSE.write(data.data)