diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-09-05 14:47:22 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-09-05 14:47:22 +0200 |
| commit | 30b683f4f3021cd191ffef04bfaf2deb65820a52 (patch) | |
| tree | b58771461581111f7bbbfd8d3e8eba012dc776ff /methods/https.cc | |
| parent | e6e893903869635ab7ee3200f654129b08717ded (diff) | |
| parent | 8c782efd93342c6119e8ba2ff6989b7a164b7f3d (diff) | |
Merge remote-tracking branch 'upstream/debian/experimental' into feature/acq-trans
Diffstat (limited to 'methods/https.cc')
| -rw-r--r-- | methods/https.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/methods/https.cc b/methods/https.cc index e0348ab58..0499af0c5 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -20,6 +20,7 @@ #include <apt-pkg/configuration.h> #include <apt-pkg/macros.h> #include <apt-pkg/strutl.h> +#include <apt-pkg/proxy.h> #include <sys/stat.h> #include <sys/time.h> @@ -107,6 +108,9 @@ void HttpsMethod::SetupProxy() /*{{{*/ { URI ServerName = Queue->Uri; + // Determine the proxy setting + AutoDetectProxy(ServerName); + // Curl should never read proxy settings from the environment, as // we determine which proxy to use. Do this for consistency among // methods and prevent an environment variable overriding a |