diff options
author | Senthil Kumaran <orsenthil@gmail.com> | 2010-12-29 06:30:19 (GMT) |
---|---|---|
committer | Senthil Kumaran <orsenthil@gmail.com> | 2010-12-29 06:30:19 (GMT) |
commit | 559395fde0d935dc5ae2891b73ac0c41cf00afb1 (patch) | |
tree | bf87bb1f18d2543e0e6cc607e8d1e0e83fe7baf0 /Lib | |
parent | 0df73674e5f2000dee01c130435c50500d599c60 (diff) | |
download | cpython-559395fde0d935dc5ae2891b73ac0c41cf00afb1.zip cpython-559395fde0d935dc5ae2891b73ac0c41cf00afb1.tar.gz cpython-559395fde0d935dc5ae2891b73ac0c41cf00afb1.tar.bz2 |
Merged revisions 87564 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r87564 | senthil.kumaran | 2010-12-29 14:25:42 +0800 (Wed, 29 Dec 2010) | 3 lines
Fix Issue 10753 - Don't quote ;=, in the PATH_INFO envvar.
........
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/test/test_wsgiref.py | 4 | ||||
-rw-r--r-- | Lib/wsgiref/util.py | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Lib/test/test_wsgiref.py b/Lib/test/test_wsgiref.py index 54be337..5866efc 100644 --- a/Lib/test/test_wsgiref.py +++ b/Lib/test/test_wsgiref.py @@ -306,6 +306,10 @@ class UtilityTests(TestCase): self.checkReqURI("http://127.0.0.1/spam", SCRIPT_NAME="/spam") 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 39e05f1..194b187 100644 --- a/Lib/wsgiref/util.py +++ b/Lib/wsgiref/util.py @@ -64,7 +64,7 @@ def request_uri(environ, include_query=1): """Return the full request URI, optionally including the query string""" url = application_uri(environ) from urllib 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: |