diff options
author | Benjamin Peterson <benjamin@python.org> | 2013-10-30 16:50:18 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2013-10-30 16:50:18 (GMT) |
commit | a50f89954d206e063d653b847a4b5bbc8c0abb8c (patch) | |
tree | c2b0ef78b0cdacf5eeb8b9b5015ee106e4d98db1 /Lib/http/server.py | |
parent | 8f169489c484cd4918a6dd0fde712cd11f1d4367 (diff) | |
parent | 35aca89617c14e0a15f728e4991eac8c01ccf170 (diff) | |
download | cpython-a50f89954d206e063d653b847a4b5bbc8c0abb8c.zip cpython-a50f89954d206e063d653b847a4b5bbc8c0abb8c.tar.gz cpython-a50f89954d206e063d653b847a4b5bbc8c0abb8c.tar.bz2 |
merge 3.2 (#19435)
Diffstat (limited to 'Lib/http/server.py')
-rw-r--r-- | Lib/http/server.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Lib/http/server.py b/Lib/http/server.py index ebc2a8f..2bfda12 100644 --- a/Lib/http/server.py +++ b/Lib/http/server.py @@ -987,18 +987,17 @@ class CGIHTTPRequestHandler(SimpleHTTPRequestHandler): def run_cgi(self): """Execute a CGI script.""" - path = self.path dir, rest = self.cgi_info - i = path.find('/', len(dir) + 1) + i = rest.find('/') while i >= 0: - nextdir = path[:i] - nextrest = path[i+1:] + nextdir = rest[:i] + nextrest = rest[i+1:] scriptdir = self.translate_path(nextdir) if os.path.isdir(scriptdir): dir, rest = nextdir, nextrest - i = path.find('/', len(dir) + 1) + i = rest.find('/') else: break |