traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge - fix the incorrect changes made for PATH_INFO value - Issue10484

This commit is contained in:
Senthil Kumaran 2012-04-11 03:16:16 +08:00
parent eba2428002 dbb369d0ef
commit d05853da97
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Lib/http/server.py
View File

@ -865,14 +865,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 = []
@ -963,8 +956,11 @@ class CGIHTTPRequestHandler(SimpleHTTPRequestHandler):
"""
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

1
Lib/test/test_httpservers.py
View File

@ -377,7 +377,6 @@ 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'),