From: Arch Librarian <arch@canonical.com>
Date: Mon, 20 Sep 2004 16:51:38 +0000 (+0000)
Subject: Made http_proxy override
X-Git-Tag: 0.7.24ubuntu1~1616
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/352c27685a2b9f3b5e0b9eb7b828af099fbdb934

Made http_proxy override
Author: jgg
Date: 1998-11-23 21:28:43 GMT
Made http_proxy override
---

diff --git a/methods/http.cc b/methods/http.cc
index babf7b972..be7e8610a 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: http.cc,v 1.6 1998/11/21 06:09:09 jgg Exp $
+// $Id: http.cc,v 1.7 1998/11/23 21:28:43 jgg Exp $
 /* ######################################################################
 
    HTTP Aquire Method - This is the HTTP aquire method for APT.
@@ -267,18 +267,23 @@ bool ServerState::Open()
    Out.Reset();
 
    // Determine the proxy setting
-   string DefProxy = _config->Find("Acquire::http::Proxy",getenv("http_proxy"));
-   string SpecificProxy = _config->Find("Acquire::http::Proxy::" + ServerName.Host);
-   if (SpecificProxy.empty() == false)
+   if (getenv("http_proxy") != 0)
    {
-      if (SpecificProxy == "DIRECT")
-	 Proxy = "";
+      string DefProxy = _config->Find("Acquire::http::Proxy");
+      string SpecificProxy = _config->Find("Acquire::http::Proxy::" + ServerName.Host);
+      if (SpecificProxy.empty() == false)
+      {
+	 if (SpecificProxy == "DIRECT")
+	    Proxy = "";
+	 else
+	    Proxy = SpecificProxy;
+      }   
       else
-	 Proxy = SpecificProxy;
-   }   
+	 Proxy = DefProxy;
+   }
    else
-      Proxy = DefProxy;
-
+      Proxy = getenv("http_proxy");
+   
    // Determine what host and port to use based on the proxy settings
    int Port = 80;
    string Host;