- Collector #2208: rewriting/setting the 'charset' part of the content-type

        HTTP header will be done only for 'text/*'

doc/CHANGES.txt

@@ -34,6 +34,9 @@ Zope Changes
 
     Bugs Fixed
 
+      - Collector #2208: rewriting/setting the 'charset' part of the content-type
+        HTTP header will be done only for 'text/*'
+
       - Call setDefaultSkin on new requests created as the result of
         ConflictError retries.
 

lib/python/ZPublisher/HTTPResponse.py

@@ -343,7 +343,7 @@ class HTTPResponse(BaseResponse):
             self.setHeader('content-type', c)
         else:
             c = self.headers['content-type']
-            if not 'charset=' in  c:
+            if c.startswith('text/') and not 'charset=' in  c:
                 c = '%s; charset=%s' % (c, default_encoding)                
                 self.setHeader('content-type', c)
 

lib/python/ZPublisher/tests/testHTTPResponse.py

@@ -94,11 +94,17 @@ class HTTPResponseTests(unittest.TestCase):
         self.assertEqual(response.headers.get('content-type'),
                          'text/plain; charset=iso-8859-15')
 
-    def test_charset_application_header(self):
+    def test_charset_application_header_no_header(self):
         response = self._makeOne(body='foo',
                     headers={'content-type': 'application/foo'})
         self.assertEqual(response.headers.get('content-type'),
-                         'application/foo; charset=iso-8859-15')
+                         'application/foo')
+
+    def test_charset_application_header_with_header(self):
+        response = self._makeOne(body='foo',
+                    headers={'content-type': 'application/foo; charset: something'})
+        self.assertEqual(response.headers.get('content-type'),
+                         'application/foo; charset: something')
     
     def test_charset_application_header_unicode(self):
         response = self._makeOne(body=unicode('rger', 'iso-8859-15'),
@@ -117,9 +123,9 @@ class HTTPResponseTests(unittest.TestCase):
 
     def test_XMLEncodingRecoding(self):
         xml = u'<?xml version="1.0" encoding="iso-8859-15" ?>\n<foo><bar/></foo>'
-        response = self._makeOne(body=xml, headers={'content-type': 'application/foo; charset=utf-8'})
+        response = self._makeOne(body=xml, headers={'content-type': 'text/xml; charset=utf-8'})
         self.assertEqual(xml.replace('iso-8859-15', 'utf-8')==response.body, True)
-        response = self._makeOne(body=xml, headers={'content-type': 'application/foo; charset=iso-8859-15'})
+        response = self._makeOne(body=xml, headers={'content-type': 'text/xml; charset=iso-8859-15'})
         self.assertEqual(xml==response.body, True)