Fixed CHARSET_RE to parse encoding also form header without white spa…

…ce between type and charset.

plone/transformchain/tests.py

@@ -723,6 +723,23 @@ def __call__(self, request, result, encoding):
 
         self.assertEquals("dummy", transformer.encoding)
 
+    def test_applyTransform_other_encoding_with_header_missing_space(self):
+        class EncodingCaptureTransformer(object):
+            implements(ITransformer)
+            encoding = None
+            def __call__(self, request, result, encoding):
+                self.encoding = encoding
+
+        transformer = EncodingCaptureTransformer()
+        provideUtility(transformer)
+
+        published = FauxPublished()
+        request = FauxRequest(published)
+        request.response.headers['content-type'] = 'text/html;charset=dummy'
+        applyTransformOnSuccess(FauxPubEvent(request))
+
+        self.assertEquals("dummy", transformer.encoding)
+
     def test_applyTransform_str(self):
         class FauxTransformer(object):
             implements(ITransformer)

plone/transformchain/zpublisher.py

@@ -20,7 +20,7 @@
     class IPubBeforeAbort(Interface):
         pass
 
-CHARSET_RE = re.compile(r'(?:application|text)/[-+0-9a-z]+\s*;\scharset=([-_0-9a-z]+)(?:(?:\s*;)|\Z)', re.IGNORECASE)
+CHARSET_RE = re.compile(r'(?:application|text)/[-+0-9a-z]+\s*;\s?charset=([-_0-9a-z]+)(?:(?:\s*;)|\Z)', re.IGNORECASE)
 
 def extractEncoding(response):
     """Get the content encoding for the response body