Inner headers for multipart/form-data default to utf-8

diff --git a/tornado/httpserver.py b/tornado/httpserver.py
index 2cadee13f05a2cd9b42b200b8ecf7f0897fa2306..344ed29fd7cadcd0d83d2e527c93e0c4e58abdef 100644 (file)
--- a/tornado/httpserver.py
+++ b/tornado/httpserver.py
@@ -432,7 +432,7 @@ class HTTPConnection(object):
             if eoh == -1:
                 logging.warning("multipart/form-data missing headers")
                 continue
-            headers = httputil.HTTPHeaders.parse(part[:eoh].decode("latin1"))
+            headers = httputil.HTTPHeaders.parse(part[:eoh].decode("utf-8"))
             name_header = headers.get("Content-Disposition", "")
             if not name_header.startswith("form-data;") or \
                not part.endswith(b("\r\n")):

diff --git a/tornado/test/httpserver_test.py b/tornado/test/httpserver_test.py
index 5bc7007a6981a38dc48262b3c981082c5f4c0836..eb0bbfdeaae9432cb004b7984a11f04b902ebba6 100644 (file)
--- a/tornado/test/httpserver_test.py
+++ b/tornado/test/httpserver_test.py
@@ -123,7 +123,7 @@ class HTTPConnectionTest(AsyncHTTPTestCase, LogTrapTestCase):
                     b(""),
                     u"\u00e1".encode("utf-8"),
                     b("--1234567890"),
-                    u'Content-Disposition: form-data; name="files"; filename="\u00f3"'.encode("latin1"),
+                    u'Content-Disposition: form-data; name="files"; filename="\u00f3"'.encode("utf8"),
                     b(""),
                     u"\u00fa".encode("utf-8"),
                     b("--1234567890"),