diff --git a/python2/httplib2/__init__.py b/python2/httplib2/__init__.py index bea87cb..c2846d0 100644 --- a/python2/httplib2/__init__.py +++ b/python2/httplib2/__init__.py @@ -962,7 +962,11 @@ def proxy_info_from_url(url, method="http", noproxy=None): """ url = urlparse.urlparse(url) - proxy_type = 3 # socks.PROXY_TYPE_HTTP + if method == 'http': + proxy_type = 4 # socks.PROXY_TYPE_HTTP_NO_TUNNEL + else: + proxy_type = 3 # socks.PROXY_TYPE_HTTP + pi = ProxyInfo( proxy_type=proxy_type, proxy_host=url.hostname,