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 6642729af58b4534a55b775a51c6107da34d404a..537df90bf28b7cff8e58d63bd9696be0a3b43534 100644 (file)
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -850,7 +850,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 e83c048ed940e1a63bed8adc9226b54d2c7036ca..4d58e4bac3199fc5fda17693efefa810ff6e54aa 100644 (file)
--- 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'),

diff --git a/Misc/NEWS b/Misc/NEWS
index 65b22e6f191c3e9c4bde11039ae53e2c4903f50e..772f78e97ddbbdc2753e641fc5260638bd38b11f 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -22,6 +22,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 #14062: Header objects now correctly respect the 'linesep' setting