summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSenthil Kumaran <orsenthil@gmail.com>2010-12-29 06:25:42 (GMT)
committerSenthil Kumaran <orsenthil@gmail.com>2010-12-29 06:25:42 (GMT)
commit299fa4cb21358c282991917f82e4c2f99aee370b (patch)
treebeaad2c1f35f6934eda28fb1aff9aa0acf34e8c5
parentde3aa7fc622800dc730f2844399f7cd567397ea5 (diff)
downloadcpython-299fa4cb21358c282991917f82e4c2f99aee370b.zip
cpython-299fa4cb21358c282991917f82e4c2f99aee370b.tar.gz
cpython-299fa4cb21358c282991917f82e4c2f99aee370b.tar.bz2
Fix Issue 10753 - Don't quote ;=, in the PATH_INFO envvar.
-rw-r--r--Lib/test/test_wsgiref.py4
-rw-r--r--Lib/wsgiref/util.py2
-rw-r--r--Misc/NEWS5
3 files changed, 10 insertions, 1 deletions
diff --git a/Lib/test/test_wsgiref.py b/Lib/test/test_wsgiref.py
index 8051b4a..b8cf635 100644
--- a/Lib/test/test_wsgiref.py
+++ b/Lib/test/test_wsgiref.py
@@ -342,6 +342,10 @@ class UtilityTests(TestCase):
self.checkReqURI("http://127.0.0.1/sp%C3%A4m", SCRIPT_NAME="/späm")
self.checkReqURI("http://127.0.0.1/spammity/spam",
SCRIPT_NAME="/spammity", PATH_INFO="/spam")
+ self.checkReqURI("http://127.0.0.1/spammity/spam;ham",
+ SCRIPT_NAME="/spammity", PATH_INFO="/spam;ham")
+ self.checkReqURI("http://127.0.0.1/spammity/spam;cookie=1234,5678",
+ SCRIPT_NAME="/spammity", PATH_INFO="/spam;cookie=1234,5678")
self.checkReqURI("http://127.0.0.1/spammity/spam?say=ni",
SCRIPT_NAME="/spammity", PATH_INFO="/spam",QUERY_STRING="say=ni")
self.checkReqURI("http://127.0.0.1/spammity/spam", 0,
diff --git a/Lib/wsgiref/util.py b/Lib/wsgiref/util.py
index ae982f0..1f1e6cc 100644
--- a/Lib/wsgiref/util.py
+++ b/Lib/wsgiref/util.py
@@ -64,7 +64,7 @@ def request_uri(environ, include_query=True):
"""Return the full request URI, optionally including the query string"""
url = application_uri(environ)
from urllib.parse import quote
- path_info = quote(environ.get('PATH_INFO',''))
+ path_info = quote(environ.get('PATH_INFO',''),safe='/;=,')
if not environ.get('SCRIPT_NAME'):
url += path_info[1:]
else:
diff --git a/Misc/NEWS b/Misc/NEWS
index 530fcc7..b4e4cf9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -20,6 +20,11 @@ Core and Builtins
Library
-------
+- Issue 10753 - Characters ';','=' and ',' in the PATH_INFO environment
+ variable won't be quoted when the URI is constructed by the wsgiref.util 's
+ request_uri method. According to RFC 3986, these characters can be a part of
+ params in PATH component of URI and need not be quoted.
+
- Issue 10738: Fix webbrowser.Opera.raise_opts
- Issue 9824: SimpleCookie now encodes , and ; in values to cater to how