wget: fix for code 302; mount: support -o union

Signed-off-by: Vladimir Dronnikov <dronnikov@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

1 files changed, 4 insertions, 1 deletions

diff --git a/networking/wget.c b/networking/wget.c
index b8cd54964..0f99e8d13 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -370,8 +370,10 @@ static void parse_url(char *src_url, struct host_info *h)
                 h->path = sp;
         }
 
+        // We used to set h->user to NULL here, but this interferes
+        // with handling of code 302 ("object was moved")
+
         sp = strrchr(h->host, '@');
-        h->user = NULL;
         if (sp != NULL) {
                 h->user = h->host;
                 *sp = '\0';
@@ -692,6 +694,7 @@ int wget_main(int argc UNUSED_PARAM, char **argv)
 
         /* TODO: compat issue: should handle "wget URL1 URL2..." */
 
+        target.user = NULL;
         parse_url(argv[optind], &target);
 
         /* Use the proxy if necessary */