aboutsummaryrefslogtreecommitdiff
path: root/networking
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2024-09-28 08:13:32 +0100
committerRon Yorston <rmy@pobox.com>2024-09-28 08:13:32 +0100
commit431e2704c17d5c0e51a0cbebfb1105bd4962b3f7 (patch)
tree6ff19e48cdcab8ba8176d22813d39a375399a610 /networking
parent940f40e371695d6b247f4b406e7eb580fb91e866 (diff)
parentdff444bc375e6eb4c6775dbfc753ba71b46e9797 (diff)
downloadbusybox-w32-431e2704c17d5c0e51a0cbebfb1105bd4962b3f7.tar.gz
busybox-w32-431e2704c17d5c0e51a0cbebfb1105bd4962b3f7.tar.bz2
busybox-w32-431e2704c17d5c0e51a0cbebfb1105bd4962b3f7.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'networking')
-rw-r--r--networking/wget.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/networking/wget.c b/networking/wget.c
index ae847044e..6a64836fb 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -1218,7 +1218,9 @@ static void download_one_url(const char *url)
1218 /*G.content_len = 0; - redundant, got_clen = 0 is enough */ 1218 /*G.content_len = 0; - redundant, got_clen = 0 is enough */
1219 G.got_clen = 0; 1219 G.got_clen = 0;
1220 G.chunked = 0; 1220 G.chunked = 0;
1221 if (use_proxy || target.protocol[0] != 'f' /*not ftp[s]*/) { 1221 if (!ENABLE_FEATURE_WGET_FTP
1222 || use_proxy || target.protocol[0] != 'f' /*not ftp[s]*/
1223 ) {
1222 /* 1224 /*
1223 * HTTP session 1225 * HTTP session
1224 */ 1226 */
@@ -1500,14 +1502,15 @@ However, in real world it was observed that some web servers
1500 1502
1501 /* For HTTP, data is pumped over the same connection */ 1503 /* For HTTP, data is pumped over the same connection */
1502 dfp = sfp; 1504 dfp = sfp;
1503 } else { 1505 }
1504#if ENABLE_FEATURE_WGET_FTP 1506#if ENABLE_FEATURE_WGET_FTP
1507 else {
1505 /* 1508 /*
1506 * FTP session 1509 * FTP session
1507 */ 1510 */
1508 sfp = prepare_ftp_session(&dfp, &target, lsa); 1511 sfp = prepare_ftp_session(&dfp, &target, lsa);
1509#endif
1510 } 1512 }
1513#endif
1511 1514
1512 free(lsa); 1515 free(lsa);
1513 1516