Ticket #2946: django-http-mimetype.diff

django/http/__init__.py

@@ -159 +159 @@
         from django.conf import settings
         self._charset = settings.DEFAULT_CHARSET
         if not mimetype:
-            mimetype = "%s; charset=%s" % (settings.DEFAULT_CONTENT_TYPE, settings.DEFAULT_CHARSET)
+            mimetype = settings.DEFAULT_CONTENT_TYPE
+        if mimetype.startswith('text/') and not 'charset=' in mimetype:
+            mimetype = "%s; charset=%s" % (mimetype, settings.DEFAULT_CHARSET)
         if hasattr(content, '__iter__'):
             self._container = content
             self._is_string = False