diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-09-23 15:47:44 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-09-23 15:47:44 +0200 |
| commit | db1d1c32149177c0b6ca49e5107ab1f5fd364660 (patch) | |
| tree | b06b22a9c92455b32889c88407f4190113a5cdd9 /apt-pkg/contrib/proxy.cc | |
| parent | 916b89109cd77728004819d4705778e3dc489b2e (diff) | |
| parent | c511c5e8ed3f59ddee1b174b39e5cc16a2f11922 (diff) | |
Merge remote-tracking branch 'upstream/debian/experimental' into feature/acq-trans
Conflicts:
apt-pkg/acquire-item.cc
apt-pkg/acquire-item.h
methods/copy.cc
test/integration/test-hashsum-verification
Diffstat (limited to 'apt-pkg/contrib/proxy.cc')
| -rw-r--r-- | apt-pkg/contrib/proxy.cc | 4 |
1 files changed, 4 insertions, 0 deletions
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", |