[CMF-checkins] CVS: CMF/CMFCore - FSPageTemplate.py:1.8.8.4

[Florent Guillaume]

Update of /cvs-repository/CMF/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv18163

Modified Files:
      Tag: CMF-1_3-branch
	FSPageTemplate.py 
Log Message:
Backport from HEAD:
Only set the 'content-type' header if one doesn't already exist in the
response.
(Same change as ChrisM's in ZopePageTemplate.py)


=== CMF/CMFCore/FSPageTemplate.py 1.8.8.3 => 1.8.8.4 ===
--- CMF/CMFCore/FSPageTemplate.py:1.8.8.3	Thu Aug  1 15:07:55 2002
+++ CMF/CMFCore/FSPageTemplate.py	Thu Sep  5 14:19:26 2002
@@ -162,7 +162,8 @@
         # call "inherited"
         result = self._ZPT_exec( bound_names, args, kw )
         if response is not None:
-            response.setHeader( 'content-type', self.content_type )
+            if not response.headers.has_key('content-type'):
+                 response.setHeader('content-type', self.content_type)
         return result
  
     # Copy over more methods