summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2014-10-12 20:53:19 +0200
committerClaude Paroz <claude@2xlibre.net>2014-10-13 17:37:58 +0200
commit59d487e7fc02980e76dad053dd989c8b4899444f (patch)
tree1260e1c50168f4d93a432c0c14c97ac2bedfb924 /django
parent8701b5900774be3126321c2449b4d0e8091a9725 (diff)
Fixed #23638 -- Prevented crash while parsing invalid cookie content
Thanks Philip Gatt for the report and Tim Graham for the review.
Diffstat (limited to 'django')
-rw-r--r--django/core/handlers/wsgi.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/core/handlers/wsgi.py b/django/core/handlers/wsgi.py
index 5032eed072..03138bb781 100644
--- a/django/core/handlers/wsgi.py
+++ b/django/core/handlers/wsgi.py
@@ -263,4 +263,4 @@ def get_str_from_wsgi(environ, key, default):
"""
value = environ.get(str(key), str(default))
# Same comment as above
- return value if six.PY2 else value.encode(ISO_8859_1).decode(UTF_8)
+ return value if six.PY2 else value.encode(ISO_8859_1).decode(UTF_8, errors='replace')