Merged revisions 82985 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82985 | gregory.p.smith | 2010-07-19 16:17:22 -0700 (Mon, 19 Jul 2010) | 3 lines

  Fixes Issue #3704: http.cookiejar was not properly handling URLs with a / in
  the parameters.  (This is jjlee's issue3704.patch ported to py3k)
........
This commit is contained in:
Gregory P. Smith 2010-07-25 19:53:20 +00:00
parent 85edadb8ab
commit 2c4973dd4a
3 changed files with 47 additions and 35 deletions

View file

@ -603,17 +603,14 @@ def eff_request_host(request):
return req_host, erhn
def request_path(request):
"""request-URI, as defined by RFC 2965."""
"""Path component of request-URI, as defined by RFC 2965."""
url = request.get_full_url()
path, parameters, query, frag = urllib.parse.urlparse(url)[2:]
if parameters:
path = "%s;%s" % (path, parameters)
path = escape_path(path)
req_path = urllib.parse.urlunparse(("", "", path, "", query, frag))
if not req_path.startswith("/"):
parts = urllib.parse.urlsplit(url)
path = escape_path(parts.path)
if not path.startswith("/"):
# fix bad RFC 2396 absoluteURI
req_path = "/"+req_path
return req_path
path = "/" + path
return path
def request_port(request):
host = request.get_host()