summaryrefslogtreecommitdiff
path: root/python2/httplib2
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2011-08-16 13:26:51 -0400
committerJason R. Coombs <jaraco@jaraco.com>2011-08-16 13:26:51 -0400
commit2dda7ee2e5a8e1d4e6531d1923a1177b1bb003c9 (patch)
tree597b75f16dcc3d66ab3494affe3e203a7e609b26 /python2/httplib2
parent96279c542cae0bc5127ee954efb071108ed53177 (diff)
downloadhttplib2-2dda7ee2e5a8e1d4e6531d1923a1177b1bb003c9.tar.gz
Fixed issue where proxy bypass detection failed when a port was specified.
Diffstat (limited to 'python2/httplib2')
-rw-r--r--python2/httplib2/__init__.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/python2/httplib2/__init__.py b/python2/httplib2/__init__.py
index ff7e384..f55e596 100644
--- a/python2/httplib2/__init__.py
+++ b/python2/httplib2/__init__.py
@@ -35,6 +35,7 @@ import gzip
import zlib
import httplib
import urlparse
+import urllib
import base64
import os
import copy
@@ -1546,12 +1547,13 @@ a string that contains the response entity body.
"""Return a ProxyInfo instance (or None) based on the scheme
and authority.
"""
+ hostname, port = urllib.splitport(authority)
proxy_info = self.proxy_info
if callable(proxy_info):
proxy_info = proxy_info(scheme)
if (hasattr(proxy_info, 'applies_to')
- and not proxy_info.applies_to(authority)):
+ and not proxy_info.applies_to(hostname)):
proxy_info = None
return proxy_info