From: Arch Librarian <arch@canonical.com>
Date: Mon, 20 Sep 2004 16:57:23 +0000 (+0000)
Subject: no_proxy and ftp. Closes: #89671
X-Git-Tag: 0.7.24ubuntu1~1047
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/fc31c31caf8c658ebe5e0e10465d86cfa9128757?hp=a6bfe58397c488da3b4fff94b27f80e6b3dbdab2

no_proxy and ftp. Closes: #89671
Author: jgg
Date: 2001-03-24 22:34:55 GMT
no_proxy and ftp. Closes: #89671
---

diff --git a/debian/changelog b/debian/changelog
index 73228cc9b..83a44df1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ apt (0.5.4) unstable; urgency=low
   * More patches from Alfredo for Vendors and more SHA-1 stuff
   * Fix for AJ's 'desire to remove perl-5.005' and possibly other
     similar situations. Closes: #56708, #59432
+  * no_proxy and ftp. Closes: #89671
   
  -- Jason Gunthorpe <jgg@debian.org>  Thu,  8 Mar 2001 22:48:06 -0700
 
diff --git a/methods/ftp.cc b/methods/ftp.cc
index a3a7cd08a..4f9410bfc 100644
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: ftp.cc,v 1.25 2001/03/13 06:51:46 jgg Exp $
+// $Id: ftp.cc,v 1.26 2001/03/24 22:34:55 jgg Exp $
 /* ######################################################################
 
    FTP Aquire Method - This is the FTP aquire method for APT.
@@ -1079,13 +1079,6 @@ int main(int argc,const char *argv[])
    {
       URI Proxy = string(getenv("ftp_proxy"));
       
-      // Parse no_proxy, a , separated list of domains
-      if (getenv("no_proxy") != 0)
-      {
-	 if (CheckDomainList(Proxy.Host,getenv("no_proxy")) == true)
-	    Proxy.Access = "";
-      }
-      
       // Run the HTTP method
       if (Proxy.Access == "http")
       {
@@ -1093,6 +1086,7 @@ int main(int argc,const char *argv[])
 	 char S[300];
 	 snprintf(S,sizeof(S),"http_proxy=%s",getenv("ftp_proxy"));
 	 putenv(S);
+	 putenv("no_proxy=");
 	 
 	 // Run the http method
 	 string Path = flNotFile(argv[0]) + "/http";