diff options
| -rw-r--r-- | Lib/http/server.py | 9 | ||||
| -rw-r--r-- | Lib/test/test_httpservers.py | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
3 files changed, 11 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'), @@ -24,6 +24,8 @@ Core and Builtins Library ------- +- Issue #10484: Fix the CGIHTTPServer's PATH_INFO handling problem. + - Issue #11199: Fix the with urllib which hangs on particular ftp urls. - Issue #14222: Use the new time.steady() function instead of time.time() for |