Merge branch 'busybox' into merge

1 files changed, 11 insertions, 11 deletions

diff --git a/networking/wget.c b/networking/wget.c
index 5ff31d278..85eae061b 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -511,23 +511,23 @@ static void parse_url(const char *src_url, struct host_info *h)
                 *p = '\0';
                 h->host = p + 3;
                 if (strcmp(url, P_FTP) == 0) {
-                        h->port = bb_lookup_port(P_FTP, "tcp", 21);
+                        h->port = bb_lookup_std_port(P_FTP, "tcp", 21);
                 } else
 #if SSL_SUPPORTED
 # if ENABLE_FEATURE_WGET_HTTPS
                 if (strcmp(url, P_FTPS) == 0) {
-                        h->port = bb_lookup_port(P_FTPS, "tcp", 990);
+                        h->port = bb_lookup_std_port(P_FTPS, "tcp", 990);
                         h->protocol = P_FTPS;
                 } else
 # endif
                 if (strcmp(url, P_HTTPS) == 0) {
-                        h->port = bb_lookup_port(P_HTTPS, "tcp", 443);
+                        h->port = bb_lookup_std_port(P_HTTPS, "tcp", 443);
                         h->protocol = P_HTTPS;
                 } else
 #endif
                 if (strcmp(url, P_HTTP) == 0) {
  http:
-                        h->port = bb_lookup_port(P_HTTP, "tcp", 80);
+                        h->port = bb_lookup_std_port(P_HTTP, "tcp", 80);
                         h->protocol = P_HTTP;
                 } else {
                         *p = ':';
@@ -545,7 +545,7 @@ static void parse_url(const char *src_url, struct host_info *h)
         //   and saves 'index.html?var=a%2Fb' (we save 'b')
         // wget 'http://busybox.net?login=john@doe':
         //   request: 'GET /?login=john@doe HTTP/1.0'
-        //   saves: 'index.html?login=john@doe' (we save '?login=john@doe')
+        //   saves: 'index.html?login=john@doe' (we save 'login=john@doe')
         // wget 'http://busybox.net#test/test':
         //   request: 'GET / HTTP/1.0'
         //   saves: 'index.html' (we save 'test')
@@ -559,13 +559,13 @@ static void parse_url(const char *src_url, struct host_info *h)
         } else if (*sp == '/') {
                 *sp = '\0';
                 h->path = sp + 1;
-        } else { // '#' or '?'
+        } else {
+                // sp points to '#' or '?'
+                // Note:
                 // http://busybox.net?login=john@doe is a valid URL
-                // memmove converts to:
-                // http:/busybox.nett?login=john@doe...
-                memmove(h->host - 1, h->host, sp - h->host);
-                h->host--;
-                sp[-1] = '\0';
+                // (without '/' between ".net" and "?"),
+                // can't store NUL at sp[-1] - this destroys hostname.
+                *sp++ = '\0';
                 h->path = sp;
         }