diff options
| author | Benjamin Peterson <benjamin@python.org> | 2013-10-30 16:48:59 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2013-10-30 16:48:59 (GMT) |
| commit | 35aca89617c14e0a15f728e4991eac8c01ccf170 (patch) | |
| tree | 195aefb6f16661914ac3b5649adbebe54f5dea34 /Lib/http | |
| parent | 58bf8d2a688cf0fe180ed929568d0294a32ef5de (diff) | |
| parent | 04e9de40f380b2695f955d68f2721d57cecbf858 (diff) | |
| download | cpython-35aca89617c14e0a15f728e4991eac8c01ccf170.zip cpython-35aca89617c14e0a15f728e4991eac8c01ccf170.tar.gz cpython-35aca89617c14e0a15f728e4991eac8c01ccf170.tar.bz2 | |
merge 3.1 (#19435)
Diffstat (limited to 'Lib/http')
| -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 5569037..bcfe894 100644 --- a/Lib/http/server.py +++ b/Lib/http/server.py @@ -968,18 +968,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 |