summaryrefslogtreecommitdiffstats
path: root/Lib/http/server.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-06-15 01:41:13 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-06-15 01:41:13 (GMT)
commita8c75fe31ae81231b05a4e100529f8d70ea93ef2 (patch)
tree7acbfad576db26bc91584c742f15144d691ed671 /Lib/http/server.py
parent0220048083866034973ce7b05735ded97d2ca4d4 (diff)
parent6cd1954c5cff4b3722a183d13648c71b18259778 (diff)
downloadcpython-a8c75fe31ae81231b05a4e100529f8d70ea93ef2.zip
cpython-a8c75fe31ae81231b05a4e100529f8d70ea93ef2.tar.gz
cpython-a8c75fe31ae81231b05a4e100529f8d70ea93ef2.tar.bz2
merge 3.3 (#21766)
Diffstat (limited to 'Lib/http/server.py')
-rw-r--r--Lib/http/server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/http/server.py b/Lib/http/server.py
index 6ce6bda..c98df19 100644
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -977,7 +977,7 @@ class CGIHTTPRequestHandler(SimpleHTTPRequestHandler):
(and the next character is a '/' or the end of the string).
"""
- collapsed_path = _url_collapse_path(self.path)
+ collapsed_path = _url_collapse_path(urllib.parse.unquote(self.path))
dir_sep = collapsed_path.find('/', 1)
head, tail = collapsed_path[:dir_sep], collapsed_path[dir_sep+1:]
if head in self.cgi_directories: