Ticket #8765: 8765.diff

django/http/__init__.py

@@ -289 +289 @@
 
         # _headers is a mapping of the lower-case name to the original case of
         # the header (required for working with legacy systems) and the header
-        # value.
-        self._headers = {'content-type': ('Content-Type', content_type)}
+        # value.  Both the name of the header and its value are ascii strings.
+        self._headers = {}
+        self.__setitem__('Content-Type', content_type)
 
     def __str__(self):
         """Full HTTP message, including headers."""

tests/regressiontests/httpwrappers/tests.py

@@ -437 +437 @@
 UnicodeEncodeError: ..., HTTP response headers must be in US-ASCII format
 
 #
+# Regression test for #8765: Content-Types passed to HttpResponse() are also
+# converted to ascii strings and an exception is raised when a non-ascii
+# value is used.
+#
+>>> r = HttpResponse(content_type=u'text/plain')
+>>> isinstance(r['Content-Type'], str)
+True
+>>> r = HttpResponse(content_type=u'text/pl\xc3\xa6in') # doctest:+ELLIPSIS
+Traceback (most recent call last):
+...
+UnicodeEncodeError: ..., HTTP response headers must be in US-ASCII format
+
+#
 # Regression test for #8278: QueryDict.update(QueryDict)
 #
 >>> x = QueryDict("a=1&a=2", mutable=True)