* commented the ftp no_proxy unseting in methods/ftp.cc

diff --git a/methods/ftp.cc b/methods/ftp.cc
index 00d3476c837c42ed9af0c181b1d5ee26075b3a5d..c115e165ddd405705b7f0f7f0fcf9579766d5e9b 100644 (file)
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -1098,8 +1098,10 @@ int main(int argc,const char *argv[])
         char S[300];
         snprintf(S,sizeof(S),"http_proxy=%s",getenv("ftp_proxy"));
         putenv(S);
         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=");
+        // mvo: because we switch from ftp to http we have to unset
+        //      "no_proxy". otherwise the http method would try to 
+        //      get a ftp url using http (see #283718)
+        putenv("no_proxy=");

         
         // Run the http method
         string Path = flNotFile(argv[0]) + "http";
         
         // Run the http method
         string Path = flNotFile(argv[0]) + "http";