changeset 5477:f00ed7c5877b

Merge with crew-stable
author Patrick Mezard <pmezard@gmail.com>
date Thu, 25 Oct 2007 00:09:13 +0200
parents 3aa5c45874c6 (current diff) b3afa6725082 (diff)
children dd5ca84ed868
files
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/httprepo.py	Sat Oct 20 03:04:34 2007 +0200
+++ b/mercurial/httprepo.py	Thu Oct 25 00:09:13 2007 +0200
@@ -230,6 +230,9 @@
             # "http_proxy.always" config is for running tests on localhost
             if (not ui.configbool("http_proxy", "always") and
                 host.lower() in no_list):
+                # avoid auto-detection of proxy settings by appending
+                # a ProxyHandler with no proxies defined.
+                handlers.append(urllib2.ProxyHandler({}))
                 ui.debug(_('disabling proxy for %s\n') % host)
             else:
                 proxyurl = urlparse.urlunsplit((