aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2014-03-11 20:30:58 +0000
committerRon Yorston <rmy@pobox.com>2014-03-11 20:30:58 +0000
commitdbd7151c0e7d991514372ebaf28d7c398acca184 (patch)
tree9ff5899967c13879dd8f6425936797f0325a6ecd
parent6acbfbee5fad0653cf64a71104e1166f01678521 (diff)
downloadbusybox-w32-dbd7151c0e7d991514372ebaf28d7c398acca184.tar.gz
busybox-w32-dbd7151c0e7d991514372ebaf28d7c398acca184.tar.bz2
busybox-w32-dbd7151c0e7d991514372ebaf28d7c398acca184.zip
wget: disable https support
-rw-r--r--networking/wget.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/networking/wget.c b/networking/wget.c
index 62a5fcc02..e68397693 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -285,10 +285,12 @@ static void parse_url(const char *src_url, struct host_info *h)
285 if (strcmp(url, P_FTP) == 0) { 285 if (strcmp(url, P_FTP) == 0) {
286 h->port = bb_lookup_port(P_FTP, "tcp", 21); 286 h->port = bb_lookup_port(P_FTP, "tcp", 21);
287 } else 287 } else
288#if !ENABLE_PLATFORM_MINGW32
288 if (strcmp(url, P_HTTPS) == 0) { 289 if (strcmp(url, P_HTTPS) == 0) {
289 h->port = bb_lookup_port(P_HTTPS, "tcp", 443); 290 h->port = bb_lookup_port(P_HTTPS, "tcp", 443);
290 h->protocol = P_HTTPS; 291 h->protocol = P_HTTPS;
291 } else 292 } else
293#endif
292 if (strcmp(url, P_HTTP) == 0) { 294 if (strcmp(url, P_HTTP) == 0) {
293 http: 295 http:
294 h->port = bb_lookup_port(P_HTTP, "tcp", 80); 296 h->port = bb_lookup_port(P_HTTP, "tcp", 80);
@@ -483,6 +485,7 @@ static FILE* prepare_ftp_session(FILE **dfpp, struct host_info *target, len_and_
483 return sfp; 485 return sfp;
484} 486}
485 487
488#if !ENABLE_PLATFORM_MINGW32
486static int spawn_https_helper(const char *host, unsigned port) 489static int spawn_https_helper(const char *host, unsigned port)
487{ 490{
488 char *allocated = NULL; 491 char *allocated = NULL;
@@ -532,6 +535,7 @@ static int spawn_https_helper(const char *host, unsigned port)
532 close(sp[1]); 535 close(sp[1]);
533 return sp[0]; 536 return sp[0];
534} 537}
538#endif
535 539
536/* See networking/ssl_helper/README */ 540/* See networking/ssl_helper/README */
537#define SSL_HELPER 0 541#define SSL_HELPER 0
@@ -813,6 +817,7 @@ static void download_one_url(const char *url)
813 int status; 817 int status;
814 818
815 /* Open socket to http(s) server */ 819 /* Open socket to http(s) server */
820#if !ENABLE_PLATFORM_MINGW32
816 if (target.protocol == P_HTTPS) { 821 if (target.protocol == P_HTTPS) {
817/* openssl-based helper 822/* openssl-based helper
818 * Inconvenient API since we can't give it an open fd 823 * Inconvenient API since we can't give it an open fd
@@ -822,6 +827,7 @@ static void download_one_url(const char *url)
822 if (!sfp) 827 if (!sfp)
823 bb_perror_msg_and_die(bb_msg_memory_exhausted); 828 bb_perror_msg_and_die(bb_msg_memory_exhausted);
824 } else 829 } else
830#endif
825 sfp = open_socket(lsa); 831 sfp = open_socket(lsa);
826#if SSL_HELPER 832#if SSL_HELPER
827 if (target.protocol == P_HTTPS) 833 if (target.protocol == P_HTTPS)