Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #4815 -- Fixed decoding of request parameters when the input en…

…coding is

not UTF-8. Thanks, Jordan Dimov.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5644 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 8d9982c5a572358f0f3fc3402766ce9e3a06d90c 1 parent 86640f3
@malcolmt malcolmt authored
Showing with 3 additions and 4 deletions.
  1. +3 −4 django/http/__init__.py
View
7 django/http/__init__.py
@@ -109,12 +109,11 @@ def __init__(self, query_string, mutable=False, encoding=None):
# *Important*: do not import settings any earlier because of note
# in core.handlers.modpython.
from django.conf import settings
- self.encoding = settings.DEFAULT_CHARSET
- else:
- self.encoding = encoding
+ encoding = settings.DEFAULT_CHARSET
+ self.encoding = encoding
self._mutable = True
for key, value in parse_qsl((query_string or ''), True): # keep_blank_values=True
- self.appendlist(force_unicode(key, errors='replace'), force_unicode(value, errors='replace'))
+ self.appendlist(force_unicode(key, encoding, errors='replace'), force_unicode(value, encoding, errors='replace'))
self._mutable = mutable
def _assert_mutable(self):
Please sign in to comment.
Something went wrong with that request. Please try again.