vendor/debian/makefile: apply 6f3c4e33 for debian/makefile as well

[apt.git] / methods / http.cc

diff --git a/methods/http.cc b/methods/http.cc
index d2f084b04afea3e4fb84db7df8d9f92fc3e3e1f5..b22b61efca5c9251713e5c334632ccd6f9634cbf 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -798,7 +798,6 @@ bool HttpMethod::Configuration(string Message)
    PipelineDepth = _config->FindI("Acquire::http::Pipeline-Depth",
                                  PipelineDepth);
    Debug = _config->FindB("Debug::Acquire::http",false);
-   AutoDetectProxyCmd = _config->Find("Acquire::http::ProxyAutoDetect");
 
    // Get the proxy to use
    AutoDetectProxy();
@@ -811,6 +810,11 @@ bool HttpMethod::Configuration(string Message)
 /* */
 bool HttpMethod::AutoDetectProxy()
 {
+   // option is "Acquire::http::Proxy-Auto-Detect" but we allow the old
+   // name without the dash ("-")
+   AutoDetectProxyCmd = _config->Find("Acquire::http::Proxy-Auto-Detect",
+                                      _config->Find("Acquire::http::ProxyAutoDetect"));
+
    if (AutoDetectProxyCmd.empty())
       return true;
 
@@ -863,3 +867,8 @@ ServerState * HttpMethod::CreateServerState(URI uri)                        /*{{{*/
    return new HttpServerState(uri, this);
 }
                                                                        /*}}}*/
+void HttpMethod::RotateDNS()                                           /*{{{*/
+{
+   ::RotateDNS();
+}
+                                                                       /*}}}*/