More debugging

1 files changed, 26 insertions, 25 deletions

diff --git a/libressl.patch b/libressl.patch
index cdcbf53..03cb0bb 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..97ca7382e 100644
+index 6a64836fb..b9a760149 100644
 --- a/networking/wget.c
 +++ b/networking/wget.c
 @@ -169,7 +169,11 @@
@@ -252,7 +252,7 @@ index 6a64836fb..97ca7382e 100644
  
         return c;
  }
-@@ -636,6 +699,30 @@ static void parse_url(const char *src_url, struct host_info *h)
+@@ -636,6 +699,31 @@ static void parse_url(const char *src_url, struct host_info *h)
          */
  }
  
@@ -264,6 +264,7 @@ index 6a64836fb..97ca7382e 100644
 +       c = tlsgets_trim_sanitize(ctx, "  %s\n");
 +       if(G.wget_buf[0] == '\0')
 +               return  NULL;
++       printf("While getting header, buf was: %s", G.wget_buf);
 +       for(s = G.wget_buf; isalnum(*s) || *s == '-' || *s == '.' || *s == '_'; ++s)
 +               *s |= 0x20;
 +       if(*s != ':')
@@ -283,7 +284,7 @@ index 6a64836fb..97ca7382e 100644
  static char *get_sanitized_hdr(FILE *fp)
  {
         char *s, *hdrval;
-@@ -689,6 +776,7 @@ static void reset_beg_range_to_zero(void)
+@@ -689,6 +777,7 @@ static void reset_beg_range_to_zero(void)
  }
  
  #if ENABLE_FEATURE_WGET_OPENSSL
@@ -291,7 +292,7 @@ index 6a64836fb..97ca7382e 100644
  static int spawn_https_helper_openssl(const char *host, unsigned port)
  {
         char *allocated = NULL;
-@@ -777,6 +865,38 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
+@@ -777,6 +866,38 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
  # endif
         return sp[0];
  }
@@ -330,7 +331,7 @@ index 6a64836fb..97ca7382e 100644
  #endif
  
  #if ENABLE_FEATURE_WGET_HTTPS
-@@ -1151,6 +1271,7 @@ static void download_one_url(const char *url)
+@@ -1151,6 +1272,7 @@ static void download_one_url(const char *url)
         server.user = NULL;
         target.user = NULL;
  
@@ -338,7 +339,7 @@ index 6a64836fb..97ca7382e 100644
         parse_url(url, &target);
  
         /* Use the proxy if necessary */
-@@ -1172,6 +1293,7 @@ static void download_one_url(const char *url)
+@@ -1172,6 +1294,7 @@ static void download_one_url(const char *url)
                         server.host = target.host;
                 }
         }
@@ -346,7 +347,7 @@ index 6a64836fb..97ca7382e 100644
  
         if (ENABLE_FEATURE_IPV6)
                 strip_ipv6_scope_id(target.host);
-@@ -1191,6 +1313,7 @@ static void download_one_url(const char *url)
+@@ -1191,6 +1314,7 @@ static void download_one_url(const char *url)
                         G.fname_out = fname_out_alloc = xstrdup(G.fname_out);
                 }
         }
@@ -354,7 +355,7 @@ index 6a64836fb..97ca7382e 100644
  #if ENABLE_FEATURE_WGET_STATUSBAR
         G.curfile = bb_get_last_path_component_nostrip(G.fname_out);
  #endif
-@@ -1206,15 +1329,19 @@ static void download_one_url(const char *url)
+@@ -1206,15 +1330,19 @@ static void download_one_url(const char *url)
                  * We are not sure it exists on remote side */
         }
  
@@ -374,7 +375,7 @@ index 6a64836fb..97ca7382e 100644
         /*G.content_len = 0; - redundant, got_clen = 0 is enough */
         G.got_clen = 0;
         G.chunked = 0;
-@@ -1229,37 +1356,64 @@ static void download_one_url(const char *url)
+@@ -1229,37 +1357,64 @@ static void download_one_url(const char *url)
  
                 /* Open socket to http(s) server */
  #if ENABLE_FEATURE_WGET_OPENSSL
@@ -452,7 +453,7 @@ index 6a64836fb..97ca7382e 100644
                 /* Send HTTP request */
                 if (use_proxy) {
                         SENDFMT(sfp, "GET %s://%s/%s HTTP/1.1\r\n",
-@@ -1270,6 +1424,7 @@ static void download_one_url(const char *url)
+@@ -1270,6 +1425,7 @@ static void download_one_url(const char *url)
                                 (option_mask32 & WGET_OPT_POST) ? "POST" : "GET",
                                 target.path);
                 }
@@ -460,7 +461,7 @@ index 6a64836fb..97ca7382e 100644
                 if (!USR_HEADER_HOST)
                         SENDFMT(sfp, "Host: %s\r\n", target.host);
                 if (!USR_HEADER_USER_AGENT)
-@@ -1280,6 +1435,7 @@ static void download_one_url(const char *url)
+@@ -1280,6 +1436,7 @@ static void download_one_url(const char *url)
                  */
                 SENDFMT(sfp, "Connection: close\r\n");
  
@@ -468,7 +469,7 @@ index 6a64836fb..97ca7382e 100644
  #if ENABLE_FEATURE_WGET_AUTHENTICATION
                 if (target.user && !USR_HEADER_AUTH) {
                         SENDFMT(sfp, "Proxy-Authorization: Basic %s\r\n"+6,
-@@ -1291,6 +1447,7 @@ static void download_one_url(const char *url)
+@@ -1291,6 +1448,7 @@ static void download_one_url(const char *url)
                 }
  #endif
  
@@ -476,7 +477,7 @@ index 6a64836fb..97ca7382e 100644
                 if (G.beg_range != 0 && !USR_HEADER_RANGE)
                         SENDFMT(sfp, "Range: bytes=%"OFF_FMT"u-\r\n", G.beg_range);
  
-@@ -1300,6 +1457,7 @@ static void download_one_url(const char *url)
+@@ -1300,6 +1458,7 @@ static void download_one_url(const char *url)
                         fputs(G.extra_headers, sfp);
                 }
  
@@ -484,7 +485,7 @@ index 6a64836fb..97ca7382e 100644
                 if (option_mask32 & WGET_OPT_POST_FILE) {
                         int fd = xopen_stdin(G.post_file);
                         G.post_data = xmalloc_read(fd, NULL);
-@@ -1314,15 +1472,18 @@ static void download_one_url(const char *url)
+@@ -1314,15 +1473,18 @@ static void download_one_url(const char *url)
                                 );
                         }
  # if ENABLE_PLATFORM_MINGW32
@@ -503,7 +504,7 @@ index 6a64836fb..97ca7382e 100644
                 } else
  # else
                         SENDFMT(sfp,
-@@ -1338,6 +1499,7 @@ static void download_one_url(const char *url)
+@@ -1338,6 +1500,7 @@ static void download_one_url(const char *url)
                         SENDFMT(sfp, "\r\n");
                 }
  
@@ -511,7 +512,7 @@ index 6a64836fb..97ca7382e 100644
                 fflush(sfp);
  
  /* Tried doing this unconditionally.
-@@ -1345,31 +1507,60 @@ static void download_one_url(const char *url)
+@@ -1345,31 +1508,60 @@ static void download_one_url(const char *url)
   */
  #if SSL_SUPPORTED
                 if (target.protocol == P_HTTPS) {
@@ -575,7 +576,7 @@ index 6a64836fb..97ca7382e 100644
                                 /* eat all remaining headers */;
                         goto read_response;
  
-@@ -1441,7 +1632,8 @@ However, in real world it was observed that some web servers
+@@ -1441,7 +1633,8 @@ However, in real world it was observed that some web servers
                 /*
                  * Retrieve HTTP headers.
                  */
@@ -585,7 +586,7 @@ index 6a64836fb..97ca7382e 100644
                         static const char keywords[] ALIGN1 =
                                 "content-length\0""transfer-encoding\0""location\0";
                         enum {
-@@ -1497,6 +1689,7 @@ However, in real world it was observed that some web servers
+@@ -1497,6 +1690,7 @@ However, in real world it was observed that some web servers
                                 goto establish_session;
                         }
                 }
@@ -593,7 +594,7 @@ index 6a64836fb..97ca7382e 100644
  //             if (status >= 300)
  //                     bb_error_msg_and_die("bad redirection (no Location: header from server)");
  
-@@ -1514,6 +1707,7 @@ However, in real world it was observed that some web servers
+@@ -1514,6 +1708,7 @@ However, in real world it was observed that some web servers
  
         free(lsa);
  
@@ -601,7 +602,7 @@ index 6a64836fb..97ca7382e 100644
         if (!(option_mask32 & WGET_OPT_SPIDER)) {
                 if (G.output_fd < 0)
                         G.output_fd = xopen(G.fname_out, G.o_flags);
-@@ -1536,6 +1730,7 @@ However, in real world it was observed that some web servers
+@@ -1536,6 +1731,7 @@ However, in real world it was observed that some web servers
                 /* ftpcmd("QUIT", NULL, sfp); - why bother? */
         }
  #endif
@@ -609,7 +610,7 @@ index 6a64836fb..97ca7382e 100644
         fclose(sfp);
  
         free(server.allocated);
-@@ -1544,11 +1739,13 @@ However, in real world it was observed that some web servers
+@@ -1544,11 +1740,13 @@ However, in real world it was observed that some web servers
         free(target.user);
         free(fname_out_alloc);
         free(redirected_path);
@@ -623,7 +624,7 @@ index 6a64836fb..97ca7382e 100644
  #if ENABLE_FEATURE_WGET_LONG_OPTIONS
         static const char wget_longopts[] ALIGN1 =
                 /* name, has_arg, val */
-@@ -1590,6 +1787,7 @@ IF_DESKTOP(       "no-parent\0"        No_argument       "\xf0")
+@@ -1590,6 +1788,7 @@ IF_DESKTOP(       "no-parent\0"        No_argument       "\xf0")
  #endif
  
         INIT_G();
@@ -631,7 +632,7 @@ index 6a64836fb..97ca7382e 100644
  
  #if ENABLE_FEATURE_WGET_TIMEOUT
         G.timeout_seconds = 900;
-@@ -1626,6 +1824,8 @@ IF_DESKTOP(       "no-parent\0"        No_argument       "\xf0")
+@@ -1626,6 +1825,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)
         );
@@ -640,7 +641,7 @@ index 6a64836fb..97ca7382e 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 +1870,7 @@ IF_DESKTOP(       "no-parent\0"        No_argument       "\xf0")
+@@ -1670,6 +1871,7 @@ IF_DESKTOP(       "no-parent\0"        No_argument       "\xf0")
         }
  #endif
  
@@ -648,7 +649,7 @@ index 6a64836fb..97ca7382e 100644
         G.output_fd = -1;
         G.o_flags = O_WRONLY | O_CREAT | O_TRUNC | O_EXCL;
         if (G.fname_out) { /* -O FILE ? */
-@@ -1691,8 +1892,11 @@ IF_DESKTOP(      "no-parent\0"        No_argument       "\xf0")
+@@ -1691,8 +1893,11 @@ IF_DESKTOP(      "no-parent\0"        No_argument       "\xf0")
                 }
         }