More error reporting

1 files changed, 40 insertions, 24 deletions

diff --git a/libressl.patch b/libressl.patch
index d8a5430..d10206f 100644
--- a/libressl.patch
+++ b/libressl.patch
@@ -135,7 +135,7 @@ index 9f1dd67ec..7e8da6df2 100644
  static void tls_xwrite(tls_state_t *tls, int len)
  {
 diff --git a/networking/wget.c b/networking/wget.c
-index 6a64836fb..33d5ff2d5 100644
+index 6a64836fb..99d0233ba 100644
 --- a/networking/wget.c
 +++ b/networking/wget.c
 @@ -169,7 +169,11 @@
@@ -305,7 +305,7 @@ index 6a64836fb..33d5ff2d5 100644
         /*G.content_len = 0; - redundant, got_clen = 0 is enough */
         G.got_clen = 0;
         G.chunked = 0;
-@@ -1229,37 +1300,58 @@ static void download_one_url(const char *url)
+@@ -1229,37 +1300,59 @@ static void download_one_url(const char *url)
  
                 /* Open socket to http(s) server */
  #if ENABLE_FEATURE_WGET_OPENSSL
@@ -330,16 +330,17 @@ index 6a64836fb..33d5ff2d5 100644
 +                       servername = xstrdup(host);
 +                       ctx = tls_client();
 +                       if(ctx == NULL)
-+                                       bb_error_msg_and_die("Out of memory 1");
++                               bb_error_msg_and_die("Out of memory 1");
 +                       struct tls_config *config;
 +                       config = tls_config_new();
 +                       if(config == NULL)
-+                                       bb_error_msg_and_die("Out of memory 2");
++                               bb_error_msg_and_die("Out of memory 2");
 +                       if(tls_configure(ctx,config) != 0)
-+                                       bb_error_msg_and_die("Failed to configure client");
++                               bb_error_msg_and_die("Failed to configure client");
 +                       sfp = tmpfile();
 +                       dfp = tmpfile();
-+                       tls_connect_fds(ctx, dfp, sfp, servername);
++                       if(tls_connect_fds(ctx, dfp, sfp, servername) != 0)
++                               bb_error_msg_and_die("Failed to connect: %s", tls_error(ctx));
 +                       tls_config_free(config);
 +                       free(allocated);
 +                       free(servername);
@@ -377,7 +378,7 @@ index 6a64836fb..33d5ff2d5 100644
                 /* Send HTTP request */
                 if (use_proxy) {
                         SENDFMT(sfp, "GET %s://%s/%s HTTP/1.1\r\n",
-@@ -1270,6 +1362,7 @@ static void download_one_url(const char *url)
+@@ -1270,6 +1363,7 @@ static void download_one_url(const char *url)
                                 (option_mask32 & WGET_OPT_POST) ? "POST" : "GET",
                                 target.path);
                 }
@@ -385,7 +386,7 @@ index 6a64836fb..33d5ff2d5 100644
                 if (!USR_HEADER_HOST)
                         SENDFMT(sfp, "Host: %s\r\n", target.host);
                 if (!USR_HEADER_USER_AGENT)
-@@ -1280,6 +1373,7 @@ static void download_one_url(const char *url)
+@@ -1280,6 +1374,7 @@ static void download_one_url(const char *url)
                  */
                 SENDFMT(sfp, "Connection: close\r\n");
  
@@ -393,7 +394,7 @@ index 6a64836fb..33d5ff2d5 100644
  #if ENABLE_FEATURE_WGET_AUTHENTICATION
                 if (target.user && !USR_HEADER_AUTH) {
                         SENDFMT(sfp, "Proxy-Authorization: Basic %s\r\n"+6,
-@@ -1291,6 +1385,7 @@ static void download_one_url(const char *url)
+@@ -1291,6 +1386,7 @@ static void download_one_url(const char *url)
                 }
  #endif
  
@@ -401,7 +402,7 @@ index 6a64836fb..33d5ff2d5 100644
                 if (G.beg_range != 0 && !USR_HEADER_RANGE)
                         SENDFMT(sfp, "Range: bytes=%"OFF_FMT"u-\r\n", G.beg_range);
  
-@@ -1300,6 +1395,7 @@ static void download_one_url(const char *url)
+@@ -1300,6 +1396,7 @@ static void download_one_url(const char *url)
                         fputs(G.extra_headers, sfp);
                 }
  
@@ -409,7 +410,7 @@ index 6a64836fb..33d5ff2d5 100644
                 if (option_mask32 & WGET_OPT_POST_FILE) {
                         int fd = xopen_stdin(G.post_file);
                         G.post_data = xmalloc_read(fd, NULL);
-@@ -1314,15 +1410,18 @@ static void download_one_url(const char *url)
+@@ -1314,15 +1411,18 @@ static void download_one_url(const char *url)
                                 );
                         }
  # if ENABLE_PLATFORM_MINGW32
@@ -428,7 +429,7 @@ index 6a64836fb..33d5ff2d5 100644
                 } else
  # else
                         SENDFMT(sfp,
-@@ -1338,6 +1437,7 @@ static void download_one_url(const char *url)
+@@ -1338,6 +1438,7 @@ static void download_one_url(const char *url)
                         SENDFMT(sfp, "\r\n");
                 }
  
@@ -436,12 +437,27 @@ index 6a64836fb..33d5ff2d5 100644
                 fflush(sfp);
  
  /* Tried doing this unconditionally.
-@@ -1358,14 +1458,23 @@ static void download_one_url(const char *url)
+@@ -1345,27 +1446,38 @@ static void download_one_url(const char *url)
+  */
+ #if SSL_SUPPORTED
+                if (target.protocol == P_HTTPS) {
++                       printf("wget download_one_url 26-2\n");
+                        /* If we use SSL helper, keeping our end of the socket open for writing
+                         * makes our end (i.e. the same fd!) readable (EAGAIN instead of EOF)
+                         * even after child closes its copy of the fd.
+                         * This helps:
+                         */
+                        shutdown(fileno(sfp), SHUT_WR);
++                       printf("wget download_one_url 26-3\n");
+                }
+ #endif
+ 
++               rewind(dfp);
++               sfp = dfp;
+                /*
                  * Retrieve HTTP response line and check for "200" status code.
                  */
   read_response:
-+               rewind(dfp);
-+               sfp = dfp;
 +               printf("wget download_one_url 27\n");
                 fgets_trim_sanitize(sfp, "  %s\n");
 +               printf("wget download_one_url 27-1\n");
@@ -460,7 +476,7 @@ index 6a64836fb..33d5ff2d5 100644
                 switch (status) {
                 case 0:
                 case 100:
-@@ -1441,6 +1550,7 @@ However, in real world it was observed that some web servers
+@@ -1441,6 +1553,7 @@ However, in real world it was observed that some web servers
                 /*
                  * Retrieve HTTP headers.
                  */
@@ -468,7 +484,7 @@ index 6a64836fb..33d5ff2d5 100644
                 while ((str = get_sanitized_hdr(sfp)) != NULL) {
                         static const char keywords[] ALIGN1 =
                                 "content-length\0""transfer-encoding\0""location\0";
-@@ -1497,6 +1607,7 @@ However, in real world it was observed that some web servers
+@@ -1497,6 +1610,7 @@ However, in real world it was observed that some web servers
                                 goto establish_session;
                         }
                 }
@@ -476,7 +492,7 @@ index 6a64836fb..33d5ff2d5 100644
  //             if (status >= 300)
  //                     bb_error_msg_and_die("bad redirection (no Location: header from server)");
  
-@@ -1514,6 +1625,7 @@ However, in real world it was observed that some web servers
+@@ -1514,6 +1628,7 @@ However, in real world it was observed that some web servers
  
         free(lsa);
  
@@ -484,7 +500,7 @@ index 6a64836fb..33d5ff2d5 100644
         if (!(option_mask32 & WGET_OPT_SPIDER)) {
                 if (G.output_fd < 0)
                         G.output_fd = xopen(G.fname_out, G.o_flags);
-@@ -1536,6 +1648,7 @@ However, in real world it was observed that some web servers
+@@ -1536,6 +1651,7 @@ However, in real world it was observed that some web servers
                 /* ftpcmd("QUIT", NULL, sfp); - why bother? */
         }
  #endif
@@ -492,7 +508,7 @@ index 6a64836fb..33d5ff2d5 100644
         fclose(sfp);
  
         free(server.allocated);
-@@ -1544,11 +1657,13 @@ However, in real world it was observed that some web servers
+@@ -1544,11 +1660,13 @@ However, in real world it was observed that some web servers
         free(target.user);
         free(fname_out_alloc);
         free(redirected_path);
@@ -506,7 +522,7 @@ index 6a64836fb..33d5ff2d5 100644
  #if ENABLE_FEATURE_WGET_LONG_OPTIONS
         static const char wget_longopts[] ALIGN1 =
                 /* name, has_arg, val */
-@@ -1590,6 +1705,7 @@ IF_DESKTOP(       "no-parent\0"        No_argument       "\xf0")
+@@ -1590,6 +1708,7 @@ IF_DESKTOP(       "no-parent\0"        No_argument       "\xf0")
  #endif
  
         INIT_G();
@@ -514,7 +530,7 @@ index 6a64836fb..33d5ff2d5 100644
  
  #if ENABLE_FEATURE_WGET_TIMEOUT
         G.timeout_seconds = 900;
-@@ -1626,6 +1742,8 @@ IF_DESKTOP(       "no-parent\0"        No_argument       "\xf0")
+@@ -1626,6 +1745,8 @@ IF_DESKTOP(       "no-parent\0"        No_argument       "\xf0")
                 IF_FEATURE_WGET_LONG_OPTIONS(, &G.post_data)
                 IF_FEATURE_WGET_LONG_OPTIONS(, &G.post_file)
         );
@@ -523,7 +539,7 @@ index 6a64836fb..33d5ff2d5 100644
  #if 0 /* option bits debug */
         if (option_mask32 & WGET_OPT_RETRIES) bb_error_msg("-t NUM");
         if (option_mask32 & WGET_OPT_nsomething) bb_error_msg("-nsomething");
-@@ -1670,6 +1788,7 @@ IF_DESKTOP(       "no-parent\0"        No_argument       "\xf0")
+@@ -1670,6 +1791,7 @@ IF_DESKTOP(       "no-parent\0"        No_argument       "\xf0")
         }
  #endif
  
@@ -531,7 +547,7 @@ index 6a64836fb..33d5ff2d5 100644
         G.output_fd = -1;
         G.o_flags = O_WRONLY | O_CREAT | O_TRUNC | O_EXCL;
         if (G.fname_out) { /* -O FILE ? */
-@@ -1691,8 +1810,11 @@ IF_DESKTOP(      "no-parent\0"        No_argument       "\xf0")
+@@ -1691,8 +1813,11 @@ IF_DESKTOP(      "no-parent\0"        No_argument       "\xf0")
                 }
         }