Ticket #21282: fix_ticket_21282_httpresponse_serialize.patch

django/http/response.py

@@ -129 +129 @@
     def serialize_headers(self):
         """HTTP headers as a bytestring."""
         headers = [
-            ('%s: %s' % (key, value)).encode('us-ascii')
+            (b'%s: %s' % (key, value))
             for key, value in self._headers.values()
         ]
         return b'\r\n'.join(headers)

tests/httpwrappers/tests.py

@@ -417 +417 @@
             self.assertRaises(SuspiciousOperation,
                               HttpResponsePermanentRedirect, url)
 
+    def test_header_value_encoding(self):
+        """Test encoding of header values."""
+        r = HttpResponse()
+        r['ascii'] = "no_special_chars"
+        r['latin1'] = "blé"  # latin1-compatible text
+        r['utf8'] = "Føŧ"  # Non-latin1-compatible, will be mime-encoded
+        serialized = r.serialize_headers()
+        header_lines = serialized.split(b'\r\n')
+        self.assertIn(b'ascii: no_special_chars', header_lines)
+        self.assertIn(b'latin1: bl\xe9', header_lines)
+        self.assertIn(b'utf8: =?utf-8?b?RsO4xac=?=', header_lines)
+
+
 class HttpResponseSubclassesTests(TestCase):
     def test_redirect(self):
         response = HttpResponseRedirect('/redirected/')