diff -Nru apt-1.0.10.2ubuntu2/debian/changelog apt-1.0.10.2ubuntu3/debian/changelog --- apt-1.0.10.2ubuntu2/debian/changelog 2016-04-19 10:36:42.000000000 +0000 +++ apt-1.0.10.2ubuntu3/debian/changelog 2016-05-18 14:23:46.000000000 +0000 @@ -1,3 +1,14 @@ +apt (1.0.10.2ubuntu3) wily; urgency=medium + + * When using the https transport mechanism, $no_proxy is ignored if apt is + getting it's proxy information from $https_proxy (as opposed to + Acquire::https::Proxy somewhere in apt config). If the source of proxy + information is Acquire::https::Proxy set in apt.conf (or apt.conf.d), + then $no_proxy is honored. This patch makes the behavior similar for + both methods of setting the proxy. (LP: #1575877) + + -- Patrick Cable Tue, 17 May 2016 15:24:08 -0400 + apt (1.0.10.2ubuntu2) wily-proposed; urgency=medium * Recheck Pre-Depends satisfaction in SmartConfigure, to avoid unconfigured diff -Nru apt-1.0.10.2ubuntu2/methods/https.cc apt-1.0.10.2ubuntu3/methods/https.cc --- apt-1.0.10.2ubuntu2/methods/https.cc 2015-10-05 14:20:42.000000000 +0000 +++ apt-1.0.10.2ubuntu3/methods/https.cc 2016-05-18 14:19:53.000000000 +0000 @@ -131,13 +131,13 @@ 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