Properly handle both HTTPS and HTTP requests through proxy

This commit is contained in:
Bernardo Damele 2010-11-12 14:21:46 +00:00
parent e1ef27f592
commit 0a83a830d9

View File

@ -668,11 +668,10 @@ def __setHTTPProxy():
# HTTPS over (Squid) Proxy fails) as long as HTTP over SSL requests # HTTPS over (Squid) Proxy fails) as long as HTTP over SSL requests
# can't be tunneled over an HTTP proxy natively by Python (<= 2.5) # can't be tunneled over an HTTP proxy natively by Python (<= 2.5)
# urllib2 standard library # urllib2 standard library
if conf.scheme == "https": if PYVERSION >= "2.6":
if PYVERSION >= "2.6": proxyHandler = urllib2.ProxyHandler({"http": __proxyString, "https": __proxyString})
proxyHandler = urllib2.ProxyHandler({"https": __proxyString}) elif conf.scheme == "https":
else: proxyHandler = ProxyHTTPSHandler(__proxyString)
proxyHandler = ProxyHTTPSHandler(__proxyString)
else: else:
proxyHandler = urllib2.ProxyHandler({"http": __proxyString}) proxyHandler = urllib2.ProxyHandler({"http": __proxyString})