summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2012-02-18 10:11:17 +0000
committerAymeric Augustin <aymeric.augustin@m4x.org>2012-02-18 10:11:17 +0000
commit813dc01cd88e13b4d125cb24061ebb86c7ce3b09 (patch)
tree7e1119ddb1b6e10f8896c73531daa31843968884 /django
parentc63a454bb684bee99aa7c13ec441040e5f091c71 (diff)
[1.3.x] Fixed #15496 -- Corrected handling of base64 file upload encoding. Backport of r16176 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.3.X@17546 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
-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 e3a03ff897..63203a4581 100644
--- a/django/http/multipartparser.py
+++ b/django/http/multipartparser.py
@@ -150,6 +150,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: