summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2016-04-27 23:24:51 +0200
committerJulian Andres Klode <jak@debian.org>2016-04-27 23:24:51 +0200
commit42ba3fa1ec004acbddf5266559bd76428d904206 (patch)
tree6e7bc0a0fc230bc6d26e8297b404dba98adf71ce
parent03d6de04fb366127d950cc484317d0e7ddebaa75 (diff)
parent8707edd9e4684ed68856cd8eeff15ebd1e8c88ea (diff)
Merge branch 'fix-https-noproxy' of github.com:patcable/apt
-rw-r--r--methods/https.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/methods/https.cc b/methods/https.cc
index ac6d355ed..fc439bef8 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -187,13 +187,13 @@ void HttpsMethod::SetupProxy() /*{{{*/
if (UseProxy == "DIRECT")
return;
- if (UseProxy.empty() == false)
+ // Parse no_proxy, a comma (,) separated list of domains we don't want to use
+ // a proxy for so we stop right here if it is in the list
+ if (getenv("no_proxy") != 0 && CheckDomainList(ServerName.Host,getenv("no_proxy")) == true)
+ return;
+
+ if (UseProxy.empty() == true)
{
- // Parse no_proxy, a comma (,) separated list of domains we don't want to use
- // a proxy for so we stop right here if it is in the list
- if (getenv("no_proxy") != 0 && CheckDomainList(ServerName.Host,getenv("no_proxy")) == true)
- return;
- } else {
const char* result = getenv("https_proxy");
// FIXME: Fall back to http_proxy is to remain compatible with
// existing setups and behaviour of apt.conf. This should be