Skip to content

Commit

Permalink
fix #2247
Browse files Browse the repository at this point in the history
We have to pass urllib3 the url without the authentication information,
else it will be parsed by httplib as a netloc and included in the request line
and Host header
  • Loading branch information
t-8ch committed Sep 25, 2014
1 parent de76fbe commit 6e1db21
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 2 deletions.
4 changes: 2 additions & 2 deletions requests/adapters.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from .packages.urllib3.util import Timeout as TimeoutSauce
from .compat import urlparse, basestring, urldefrag
from .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers,
prepend_scheme_if_needed, get_auth_from_url)
prepend_scheme_if_needed, get_auth_from_url, urldefragauth)
from .structures import CaseInsensitiveDict
from .packages.urllib3.exceptions import ConnectTimeoutError
from .packages.urllib3.exceptions import HTTPError as _HTTPError
Expand Down Expand Up @@ -270,7 +270,7 @@ def request_url(self, request, proxies):
proxy = proxies.get(scheme)

if proxy and scheme != 'https':
url, _ = urldefrag(request.url)
url = urldefragauth(request.url)
else:
url = request.path_url

Expand Down
15 changes: 15 additions & 0 deletions requests/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -672,3 +672,18 @@ def to_native_string(string, encoding='ascii'):
out = string.decode(encoding)

return out


def urldefragauth(url):
"""
Given a url remove the fragment and the authentication part
"""
scheme, netloc, path, params, query, fragment = urlparse(url)

# see func:`prepend_scheme_if_needed`
if not netloc:
netloc, path = path, netloc

netloc = netloc.rsplit('@', 1)[-1]

return urlunparse((scheme, netloc, path, params, query, ''))

0 comments on commit 6e1db21

Please sign in to comment.