[Zope-Checkins] CVS: Packages/ZPublisher - HTTPResponse.py:1.75.2.8

[Florent Guillaume]

Update of /cvs-repository/Packages/ZPublisher
In directory cvs.zope.org:/tmp/cvs-serv11043

Modified Files:
      Tag: Zope-2_7-branch
	HTTPResponse.py 
Log Message:
Allow encoding of application/xhtml+xml pages according to the charset
specified in the Content-Type header.


=== Packages/ZPublisher/HTTPResponse.py 1.75.2.7 => 1.75.2.8 ===
--- Packages/ZPublisher/HTTPResponse.py:1.75.2.7	Mon Nov  8 01:49:18 2004
+++ Packages/ZPublisher/HTTPResponse.py	Fri Nov 26 12:24:30 2004
@@ -422,7 +422,7 @@
         return self.use_HTTP_content_compression
 
     def _encode_unicode(self,body,
-                        charset_re=re.compile(r'text/[0-9a-z]+\s*;\s*' +
+                        charset_re=re.compile(r'(?:application|text)/[-+0-9a-z]+\s*;\s*' +
                                               r'charset=([-_0-9a-z]+' +
                                               r')(?:(?:\s*;)|\Z)',
                                               re.IGNORECASE)):