Merge remote-tracking branch 'upstream/debian/experimental' into feature/acq-trans

[apt.git] / methods / https.cc

diff --git a/methods/https.cc b/methods/https.cc
index e0348ab58f7fd36b96e8c140f4eaf2bd31ff0cf1..0499af0c5126bc629bc0ac8b96c8a45ca98bf814 100644 (file)
--- 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