Merge with matt

[apt.git] / methods / ftp.cc

diff --git a/methods/ftp.cc b/methods/ftp.cc
index 00d3476c837c42ed9af0c181b1d5ee26075b3a5d..fafa10534c4fd38e26e6fb19b65a6cedb3d2f483 100644 (file)
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -1098,8 +1098,7 @@ int main(int argc,const char *argv[])
         char S[300];
         snprintf(S,sizeof(S),"http_proxy=%s",getenv("ftp_proxy"));
         putenv(S);
-        //mvo: why should we unset no_proxy here?
-        //putenv("no_proxy=");
+        putenv("no_proxy=");
         
         // Run the http method
         string Path = flNotFile(argv[0]) + "http";