mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-29 00:26:07 +00:00
Code Issues 32 Releases Wiki Activity

[1.6.x] Fixed #22996 -- Prevented crash with unencoded query string

Browse Source 
Thanks Jorge Carleitao for the report and Aymeric Augustin, Tim Graham
for the reviews.
Backport of fa02120d36 from master.
This commit is contained in:
Claude Paroz
2014-08-19 22:38:45 +02:00
parent c0e49ef767
commit 9f9fdc4b0a
4 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
django/core/handlers/wsgi.py
View File

@@ -134,7 +134,7 @@ class WSGIRequest(http.HttpRequest):
# The WSGI spec says 'QUERY_STRING' may be absent.
raw_query_string = self.environ.get('QUERY_STRING', str(''))
if six.PY3:
raw_query_string = raw_query_string.encode('iso-8859-1').decode('utf-8')
raw_query_string = raw_query_string.encode('iso-8859-1')
self._get = http.QueryDict(raw_query_string, encoding=self._encoding)
return self._get

8
django/http/request.py
View File

@@ -290,8 +290,12 @@ class QueryDict(MultiValueDict):
self.encoding = encoding
if six.PY3:
if isinstance(query_string, bytes):
# query_string contains URL-encoded data, a subset of ASCII.
query_string = query_string.decode()
# query_string normally contains URL-encoded data, a subset of ASCII.
try:
query_string = query_string.decode(encoding)
except UnicodeDecodeError:
# ... but some user agents are misbehaving :-(
query_string = query_string.decode('iso-8859-1')
for key, value in parse_qsl(query_string or '',
keep_blank_values=True,
encoding=encoding):