From d73fe42cf042fbc9d8d2b38eb67bd7efaa4be412 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 12 Sep 2014 11:44:11 +0200 Subject: Allow override of Proxy-Auto-Detect by the users configuration Only run the Proxy-Auto-Detect code if there is not already a host specific configuration. Closes: 759264 --- apt-pkg/contrib/proxy.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apt-pkg/contrib/proxy.cc b/apt-pkg/contrib/proxy.cc index b58db8478..0c753131d 100644 --- a/apt-pkg/contrib/proxy.cc +++ b/apt-pkg/contrib/proxy.cc @@ -26,6 +26,10 @@ bool AutoDetectProxy(URI &URL) // we support both http/https debug options bool Debug = _config->FindB("Debug::Acquire::"+URL.Access,false); + // the user already explicitly set a proxy for this host + if(_config->Find("Acquire::"+URL.Access+"::proxy::"+URL.Host, "") != "") + return true; + // option is "Acquire::http::Proxy-Auto-Detect" but we allow the old // name without the dash ("-") std::string AutoDetectProxyCmd = _config->Find("Acquire::"+URL.Access+"::Proxy-Auto-Detect", -- cgit v1.2.3