Show More
@@ -93,7 +93,9 b' class proxyhandler(urllib2.ProxyHandler)' | |||||
93 | proxies = {} |
|
93 | proxies = {} | |
94 |
|
94 | |||
95 | # urllib2 takes proxy values from the environment and those |
|
95 | # urllib2 takes proxy values from the environment and those | |
96 |
# will take precedence if found |
|
96 | # will take precedence if found. So, if there's a config entry | |
|
97 | # defining a proxy, drop the environment ones | |||
|
98 | if ui.config("http_proxy", "host"): | |||
97 | for env in ["HTTP_PROXY", "http_proxy", "no_proxy"]: |
|
99 | for env in ["HTTP_PROXY", "http_proxy", "no_proxy"]: | |
98 | try: |
|
100 | try: | |
99 | if env in os.environ: |
|
101 | if env in os.environ: |
General Comments 0
You need to be logged in to leave comments.
Login now