diff options
| author | Senthil Kumaran <senthil@uthcode.com> | 2012-03-16 08:14:51 (GMT) |
|---|---|---|
| committer | Senthil Kumaran <senthil@uthcode.com> | 2012-03-16 08:14:51 (GMT) |
| commit | 209d70e57957779e5b94e772a70e00a6425a1aaf (patch) | |
| tree | 31b6c6a258441515509ef5e945e64719e44bbd02 /Lib | |
| parent | 2a1e74a07575847112da4c06cfd2159ef5084639 (diff) | |
| parent | be3f851411f54b71251743997c1e8b2485f99de2 (diff) | |
| download | cpython-209d70e57957779e5b94e772a70e00a6425a1aaf.zip cpython-209d70e57957779e5b94e772a70e00a6425a1aaf.tar.gz cpython-209d70e57957779e5b94e772a70e00a6425a1aaf.tar.bz2 | |
closes issue10484 - Fix the http.server's cgi PATH_INFO handling problem
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/http/server.py | 9 | ||||
| -rw-r--r-- | Lib/test/test_httpservers.py | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Lib/http/server.py b/Lib/http/server.py index 78fbcda..8326f30 100644 --- a/Lib/http/server.py +++ b/Lib/http/server.py @@ -865,7 +865,14 @@ def _url_collapse_path_split(path): # Filter out blank non trailing parts before consuming the '..'. path_parts = [part for part in path_parts[:-1] if part] + path_parts[-1:] if path_parts: - tail_part = path_parts.pop() + # Special case for CGI's for PATH_INFO + if path.startswith('/cgi-bin') or path.startswith('/htbin'): + tail_part = [] + while path_parts[-1] not in ('cgi-bin','htbin'): + tail_part.insert(0,path_parts.pop()) + tail_part = "/".join(tail_part) + else: + tail_part = path_parts.pop() else: tail_part = '' head_parts = [] diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py index cc15dd6..1b807dd 100644 --- a/Lib/test/test_httpservers.py +++ b/Lib/test/test_httpservers.py @@ -377,6 +377,7 @@ class CGIHTTPServerTestCase(BaseTestCase): '/.//': ('/', ''), 'cgi-bin/file1.py': ('/cgi-bin', 'file1.py'), '/cgi-bin/file1.py': ('/cgi-bin', 'file1.py'), + '/cgi-bin/file1.py/PATH-INFO': ('/cgi-bin', 'file1.py/PATH-INFO'), 'a': ('/', 'a'), '/a': ('/', 'a'), '//a': ('/', 'a'), |