1 files changed, 53 insertions, 0 deletions

diff --git a/networking/wget.c b/networking/wget.c
index ec3767793..6a64836fb 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -214,6 +214,9 @@ enum {
         HDR_CONTENT_TYPE  = (1<<3),
         HDR_AUTH          = (1<<4) * ENABLE_FEATURE_WGET_AUTHENTICATION,
         HDR_PROXY_AUTH    = (1<<5) * ENABLE_FEATURE_WGET_AUTHENTICATION,
+# if ENABLE_PLATFORM_MINGW32
+        HDR_CONTENT_LENGTH = (1<<(4 + 2 * ENABLE_FEATURE_WGET_AUTHENTICATION)),
+# endif
 };
 static const char wget_user_headers[] ALIGN1 =
         "Host:\0"
@@ -224,6 +227,9 @@ static const char wget_user_headers[] ALIGN1 =
         "Authorization:\0"
         "Proxy-Authorization:\0"
 # endif
+# if ENABLE_PLATFORM_MINGW32
+        "Content-Length:\0"
+# endif
         ;
 # define USR_HEADER_HOST         (G.user_headers & HDR_HOST)
 # define USR_HEADER_USER_AGENT   (G.user_headers & HDR_USER_AGENT)
@@ -231,6 +237,7 @@ static const char wget_user_headers[] ALIGN1 =
 # define USR_HEADER_CONTENT_TYPE (G.user_headers & HDR_CONTENT_TYPE)
 # define USR_HEADER_AUTH         (G.user_headers & HDR_AUTH)
 # define USR_HEADER_PROXY_AUTH   (G.user_headers & HDR_PROXY_AUTH)
+# define USR_HEADER_CONTENT_LENGTH (G.user_headers & HDR_CONTENT_LENGTH)
 #else /* No long options, no user-headers :( */
 # define USR_HEADER_HOST         0
 # define USR_HEADER_USER_AGENT   0
@@ -238,6 +245,7 @@ static const char wget_user_headers[] ALIGN1 =
 # define USR_HEADER_CONTENT_TYPE 0
 # define USR_HEADER_AUTH         0
 # define USR_HEADER_PROXY_AUTH   0
+# define USR_HEADER_CONTENT_LENGTH 0
 #endif
 
 /* Globals */
@@ -517,6 +525,9 @@ static int ftpcmd(const char *s1, const char *s2, FILE *fp)
                         fprintf(stderr, "--> %s%s\n\n", s1, s2);
                 fflush(fp);
                 log_io("> %s%s", s1, s2);
+#if ENABLE_PLATFORM_MINGW32
+                fseek(fp, 0L, SEEK_CUR);
+#endif
         }
 
         /* Read until "Nxx something" is received */
@@ -524,6 +535,9 @@ static int ftpcmd(const char *s1, const char *s2, FILE *fp)
         do {
                 fgets_trim_sanitize(fp, "%s\n");
         } while (!isdigit(G.wget_buf[0]) || G.wget_buf[3] != ' ');
+#if ENABLE_PLATFORM_MINGW32
+        fseek(fp, 0L, SEEK_CUR);
+#endif
 
         G.wget_buf[3] = '\0';
         result = xatoi_positive(G.wget_buf);
@@ -766,6 +780,7 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
 #endif
 
 #if ENABLE_FEATURE_WGET_HTTPS
+# if !ENABLE_PLATFORM_MINGW32
 static void spawn_ssl_client(const char *host, int network_fd, int flags)
 {
         int sp[2];
@@ -820,6 +835,31 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags)
         close(sp[1]);
         xmove_fd(sp[0], network_fd);
 }
+# else
+static void spawn_ssl_client(const char *host, int network_fd, int flags)
+{
+        int fd1;
+        char *servername, *p, *cmd;
+
+        servername = xstrdup(host);
+        p = strrchr(servername, ':');
+        if (p) *p = '\0';
+
+        fflush_all();
+
+        cmd = xasprintf("ssl_client -h %p -n %s%s",
+                                        (void *)_get_osfhandle(network_fd), servername,
+                                        flags & TLSLOOP_EXIT_ON_LOCAL_EOF ? " -e" : "");
+
+        if ((fd1=mingw_popen_fd("ssl_client", cmd, "b", -1, NULL)) == -1) {
+                bb_perror_msg_and_die("can't execute ssl_client");
+        }
+
+        free(cmd);
+        free(servername);
+        xmove_fd(fd1, network_fd);
+}
+# endif
 #endif
 
 #if ENABLE_FEATURE_WGET_FTP
@@ -1273,6 +1313,18 @@ static void download_one_url(const char *url)
                                         "Content-Type: application/x-www-form-urlencoded\r\n"
                                 );
                         }
+# if ENABLE_PLATFORM_MINGW32
+                        if (!USR_HEADER_CONTENT_LENGTH)
+                                SENDFMT(sfp, "Content-Length: %u\r\n",
+                                        (int)strlen(G.post_data)
+                                );
+                        SENDFMT(sfp,
+                                "\r\n"
+                                "%s",
+                                G.post_data
+                        );
+                } else
+# else
                         SENDFMT(sfp,
                                 "Content-Length: %u\r\n"
                                 "\r\n"
@@ -1280,6 +1332,7 @@ static void download_one_url(const char *url)
                                 (int) strlen(G.post_data), G.post_data
                         );
                 } else
+# endif
 #endif
                 {
                         SENDFMT(sfp, "\r\n");