[svn] Add the --user, --password, --ftp-user and --ftp-password options.

[wget] / src / http.c

diff --git a/src/http.c b/src/http.c
index 9162d85e3f662765a80cc722bc27a06bf6a6c116..ed027a99a920f9eb056589fc46331a4e6e3c9291 100644 (file)
--- a/src/http.c
+++ b/src/http.c
@@ -1243,8 +1243,8 @@ gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy)
   user = u->user;
   passwd = u->passwd;
   search_netrc (u->host, (const char **)&user, (const char **)&passwd, 0);
-  user = user ? user : opt.http_user;
-  passwd = passwd ? passwd : opt.http_passwd;
+  user = user ? user : (opt.http_user ? opt.http_user : opt.user);
+  passwd = passwd ? passwd : (opt.http_passwd ? opt.http_passwd : opt.passwd);
 
   if (user && passwd)
     {