[Bug #737202; fix from Titus Brown] Make CGIHTTPServer work for scripts in sub-directories
diff --git a/Lib/CGIHTTPServer.py b/Lib/CGIHTTPServer.py
index 7a5c819..c119c9a 100644
--- a/Lib/CGIHTTPServer.py
+++ b/Lib/CGIHTTPServer.py
@@ -105,17 +105,36 @@
def run_cgi(self):
"""Execute a CGI script."""
+ path = self.path
dir, rest = self.cgi_info
+
+ i = path.find('/', len(dir) + 1)
+ while i >= 0:
+ nextdir = path[:i]
+ nextrest = path[i+1:]
+
+ scriptdir = self.translate_path(nextdir)
+ if os.path.isdir(scriptdir):
+ dir, rest = nextdir, nextrest
+ i = path.find('/', len(dir) + 1)
+ else:
+ break
+
+ # find an explicit query string, if present.
i = rest.rfind('?')
if i >= 0:
rest, query = rest[:i], rest[i+1:]
else:
query = ''
+
+ # dissect the part after the directory name into a script name &
+ # a possible additional path, to be stored in PATH_INFO.
i = rest.find('/')
if i >= 0:
script, rest = rest[:i], rest[i:]
else:
script, rest = rest, ''
+
scriptname = dir + '/' + script
scriptfile = self.translate_path(scriptname)
if not os.path.exists(scriptfile):
diff --git a/Misc/NEWS b/Misc/NEWS
index 93e9d0a..dca49c1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -122,6 +122,9 @@
Library
-------
+- Bug #737202: Make CGIHTTPServer work for scripts in subdirectories.
+ Fix by Titus Brown.
+
- Patch #1608267: fix a race condition in os.makedirs() is the directory
to be created is already there.