X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Fmain.c;h=e84efddcad92cffe3f940d10fa1f6a798b24fb8f;hp=9bc979aa6c0eb5174bc9ff4b8bd4008f7fb9060e;hb=9d9f134fdf4c2d45d112e26f9b8a3e3d07af9003;hpb=f2613b6ddb8784e5abfddc4e3ef2ec7aa4cb32bd

diff --git a/src/main.c b/src/main.c
index 9bc979aa..e84efddc 100644
--- a/src/main.c
+++ b/src/main.c
@@ -945,8 +945,18 @@ Can't timestamp and not clobber old files at the same time.\n"));
       int dt;
 
       if ((opt.recursive || opt.page_requisites)
-	  && url_scheme (*t) != SCHEME_FTP)
-	status = retrieve_tree (*t);
+	  && (url_scheme (*t) != SCHEME_FTP || opt.use_proxy))
+      	{
+	  int old_follow_ftp = opt.follow_ftp;
+
+	  /* Turn opt.follow_ftp on in case of recursive FTP retrieval */
+	  if (url_scheme (*t) == SCHEME_FTP) 
+	    opt.follow_ftp = 1;
+	  
+	  status = retrieve_tree (*t);
+
+	  opt.follow_ftp = old_follow_ftp;
+	}
       else
 	status = retrieve_url (*t, &filename, &redirected_URL, NULL, &dt, opt.recursive);