try a different way to open socket

1 files changed, 25 insertions, 14 deletions

diff --git a/libressl.patch b/libressl.patch
index cb233da..8f061e2 100644
--- a/libressl.patch
+++ b/libressl.patch
@@ -135,10 +135,20 @@ 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..7ca84e645 100644
+index 6a64836fb..a99bf8dcb 100644
 --- a/networking/wget.c
 +++ b/networking/wget.c
-@@ -689,6 +689,7 @@ static void reset_beg_range_to_zero(void)
+@@ -169,7 +169,8 @@
+ //usage:     "\n       -Y on/off       Use proxy"
+ 
+ #include "libbb.h"
+-
++#include <string.h>
++#include <errno.h>
+ #if 0
+ # define log_io(...) bb_error_msg(__VA_ARGS__)
+ # define SENDFMT(fp, fmt, ...) \
+@@ -689,6 +690,7 @@ static void reset_beg_range_to_zero(void)
  }
  
  #if ENABLE_FEATURE_WGET_OPENSSL
@@ -146,7 +156,7 @@ index 6a64836fb..7ca84e645 100644
  static int spawn_https_helper_openssl(const char *host, unsigned port)
  {
         char *allocated = NULL;
-@@ -777,6 +778,35 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
+@@ -777,6 +779,33 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
  # endif
         return sp[0];
  }
@@ -156,7 +166,6 @@ index 6a64836fb..7ca84e645 100644
 +{
 +               char* allocated = NULL;
 +               char *servername, *cmd;
-+               int sp[2];
 +               if(!strchr(host,":"))
 +                               host = allocated = xasprintf("%s:%u",host,port);
 +               servername = xstrdup(host);
@@ -170,19 +179,18 @@ index 6a64836fb..7ca84e645 100644
 +                               bb_error_msg_and_die("Out of memory 2");
 +               if(tls_configure(ctx,config) != 0)
 +                               bb_error_msg_and_die("Failed to configure client");
-+               tls_connect_fds(ctx,sp[0],sp[1],servername);
-+               close(sp[1]);
++               int ret = tls_connect(ctx,servername,NULL);
 +               tls_config_free(config);
 +               tls_free(ctx);
 +               free(allocated);
 +               free(servername);
-+               return sp[0];
++               return ret;
 +}
 +# endif
  #endif
  
  #if ENABLE_FEATURE_WGET_HTTPS
-@@ -1151,6 +1181,7 @@ static void download_one_url(const char *url)
+@@ -1151,6 +1180,7 @@ static void download_one_url(const char *url)
         server.user = NULL;
         target.user = NULL;
  
@@ -190,7 +198,7 @@ index 6a64836fb..7ca84e645 100644
         parse_url(url, &target);
  
         /* Use the proxy if necessary */
-@@ -1172,6 +1203,7 @@ static void download_one_url(const char *url)
+@@ -1172,6 +1202,7 @@ static void download_one_url(const char *url)
                         server.host = target.host;
                 }
         }
@@ -198,7 +206,7 @@ index 6a64836fb..7ca84e645 100644
  
         if (ENABLE_FEATURE_IPV6)
                 strip_ipv6_scope_id(target.host);
-@@ -1191,6 +1223,7 @@ static void download_one_url(const char *url)
+@@ -1191,6 +1222,7 @@ static void download_one_url(const char *url)
                         G.fname_out = fname_out_alloc = xstrdup(G.fname_out);
                 }
         }
@@ -206,7 +214,7 @@ index 6a64836fb..7ca84e645 100644
  #if ENABLE_FEATURE_WGET_STATUSBAR
         G.curfile = bb_get_last_path_component_nostrip(G.fname_out);
  #endif
-@@ -1206,15 +1239,19 @@ static void download_one_url(const char *url)
+@@ -1206,15 +1238,19 @@ static void download_one_url(const char *url)
                  * We are not sure it exists on remote side */
         }
  
@@ -226,7 +234,7 @@ index 6a64836fb..7ca84e645 100644
         /*G.content_len = 0; - redundant, got_clen = 0 is enough */
         G.got_clen = 0;
         G.chunked = 0;
-@@ -1229,37 +1266,48 @@ static void download_one_url(const char *url)
+@@ -1229,37 +1265,49 @@ static void download_one_url(const char *url)
  
                 /* Open socket to http(s) server */
  #if ENABLE_FEATURE_WGET_OPENSSL
@@ -252,8 +260,11 @@ index 6a64836fb..7ca84e645 100644
  # endif
 +                       printf("wget download_one_url 13\n");
                         sfp = fdopen(fd, "r+");
-                        if (!sfp)
-                                bb_die_memory_exhausted();
+-                       if (!sfp)
+-                               bb_die_memory_exhausted();
++                       if (!sfp){
++                               bb_error_msg_and_die("Error opening fd: %s",strerror(errno));
++                       }
 +                       printf("wget download_one_url 14\n");
                         goto socket_opened;
                 }