summaryrefslogtreecommitdiff
path: root/django/http/multipartparser.py
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2011-05-07 16:59:16 +0000
committerJannis Leidel <jannis@leidel.info>2011-05-07 16:59:16 +0000
commiteb24b546340d500502278bd124dbd527963ca4c4 (patch)
tree2fb36bdb04f4981372ede3540f131c985287c498 /django/http/multipartparser.py
parent02b837d38a37239dcd7366e7735e12aff51ab790 (diff)
Fixed #15496 -- Corrected handling of base64 file upload encoding. Thanks, gene and Claude Paroz.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16176 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/http/multipartparser.py')
-rw-r--r--django/http/multipartparser.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/django/http/multipartparser.py b/django/http/multipartparser.py
index e45d5d1035..ae143f79ed 100644
--- a/django/http/multipartparser.py
+++ b/django/http/multipartparser.py
@@ -145,6 +145,8 @@ class MultiPartParser(object):
continue
transfer_encoding = meta_data.get('content-transfer-encoding')
+ if transfer_encoding is not None:
+ transfer_encoding = transfer_encoding[0].strip()
field_name = force_unicode(field_name, encoding, errors='replace')
if item_type == FIELD: