summaryrefslogtreecommitdiffstats
path: root/Lib/http
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-06-15 01:41:31 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-06-15 01:41:31 (GMT)
commitff180af0572ce64ea7b4bb99957cf0c216adce36 (patch)
tree284a7316b8d3c44f71266b3dd1e817f1f06010d2 /Lib/http
parent48f68d00b8e017050489635c04c82153a345a336 (diff)
parenta8c75fe31ae81231b05a4e100529f8d70ea93ef2 (diff)
downloadcpython-ff180af0572ce64ea7b4bb99957cf0c216adce36.zip
cpython-ff180af0572ce64ea7b4bb99957cf0c216adce36.tar.gz
cpython-ff180af0572ce64ea7b4bb99957cf0c216adce36.tar.bz2
merge 3.4 (#21766)
Diffstat (limited to 'Lib/http')
-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: