closes issue10484 - Fix the http.server's cgi PATH_INFO handling problem
diff --git a/Lib/http/server.py b/Lib/http/server.py
index 6642729..537df90 100644
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -850,7 +850,14 @@
# 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 e83c048..4d58e4b 100644
--- a/Lib/test/test_httpservers.py
+++ b/Lib/test/test_httpservers.py
@@ -377,6 +377,7 @@
'/.//': ('/', ''),
'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'),
diff --git a/Misc/NEWS b/Misc/NEWS
index 65b22e6..772f78e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -22,6 +22,8 @@
Library
-------
+- Issue #10484: Fix the CGIHTTPServer's PATH_INFO handling problem.
+
- Issue #11199: Fix the with urllib which hangs on particular ftp urls.
- Issue #14062: Header objects now correctly respect the 'linesep' setting