diff options
author | Senthil Kumaran <senthil@uthcode.com> | 2012-04-10 19:07:57 (GMT) |
---|---|---|
committer | Senthil Kumaran <senthil@uthcode.com> | 2012-04-10 19:07:57 (GMT) |
commit | fb2e874707b0817124a2427a9367276b13fbc4ad (patch) | |
tree | 1832bb00b2f21ec2178bec8dac78350661cdd05f /Lib/CGIHTTPServer.py | |
parent | b1df31f81eb23905769444f97d364e0042b65e14 (diff) | |
download | cpython-fb2e874707b0817124a2427a9367276b13fbc4ad.zip cpython-fb2e874707b0817124a2427a9367276b13fbc4ad.tar.gz cpython-fb2e874707b0817124a2427a9367276b13fbc4ad.tar.bz2 |
fix the incorrect changes made for PATH_INFO value - Issue10484
Diffstat (limited to 'Lib/CGIHTTPServer.py')
-rw-r--r-- | Lib/CGIHTTPServer.py | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/Lib/CGIHTTPServer.py b/Lib/CGIHTTPServer.py index 2ca8217..61f34f8 100644 --- a/Lib/CGIHTTPServer.py +++ b/Lib/CGIHTTPServer.py @@ -85,8 +85,11 @@ class CGIHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): (and the next character is a '/' or the end of the string). """ splitpath = _url_collapse_path_split(self.path) - if splitpath[0] in self.cgi_directories: - self.cgi_info = splitpath + joined_path = '/'.join(splitpath) + dir_sep = joined_path.find('/', 1) + head, tail = joined_path[:dir_sep], joined_path[dir_sep+1:] + if head in self.cgi_directories: + self.cgi_info = head, tail return True return False @@ -323,14 +326,7 @@ 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: - # 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() + tail_part = path_parts.pop() else: tail_part = '' head_parts = [] |