From 51a65c91611aa7deb222f24ad2c94021910b7a54 Mon Sep 17 00:00:00 2001
From: Senthil Kumaran <senthil@uthcode.com>
Date: Fri, 16 Mar 2012 01:07:16 -0700
Subject: [PATCH] 2.7 - Issue #10484: Fix the CGIHTTPServer's PATH_INFO
 handling problem

---
 Lib/CGIHTTPServer.py         | 9 ++++++++-
 Lib/test/test_httpservers.py | 1 +
 Misc/NEWS                    | 2 ++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Lib/CGIHTTPServer.py b/Lib/CGIHTTPServer.py
index 13ca0b514bf..2ca8217bcb2 100644
--- a/Lib/CGIHTTPServer.py
+++ b/Lib/CGIHTTPServer.py
@@ -323,7 +323,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 97abdf56929..a7752d92767 100644
--- a/Lib/test/test_httpservers.py
+++ b/Lib/test/test_httpservers.py
@@ -429,6 +429,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 376d8d31eb4..b8edcaa831e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -20,6 +20,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 #5219: Prevent event handler cascade in IDLE.