apply post-1.16.0 fixes, bump version to 1.16.11_16_1

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

1 files changed, 3 insertions, 0 deletions

diff --git a/networking/wget.c b/networking/wget.c
index ad1770b58..0aab3c288 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -546,6 +546,8 @@ int wget_main(int argc UNUSED_PARAM, char **argv)
                 "passive-ftp\0"      No_argument       "\xff"
                 "header\0"           Required_argument "\xfe"
                 "post-data\0"        Required_argument "\xfd"
+                /* Ignored (we don't do ssl) */
+                "no-check-certificate\0" No_argument   "\xfc"
                 ;
 #endif
 
@@ -590,6 +592,7 @@ int wget_main(int argc UNUSED_PARAM, char **argv)
         if (use_proxy) {
                 proxy = getenv(target.is_ftp ? "ftp_proxy" : "http_proxy");
                 if (proxy && proxy[0]) {
+                        server.user = NULL;
                         parse_url(proxy, &server);
                 } else {
                         use_proxy = 0;