emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wget: use closed HTTP/1.1 connection, stop when we dl'ed $content_len bytes

Browse Source 
function                                             old     new   delta
retrieve_file_data                                   353     367     +14

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2011-02-10 13:23:45 +01:00
parent aaf091f97d
commit 9213a55bf0
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
networking/wget.c
View File

@ -510,8 +510,11 @@ static void NOINLINE retrieve_file_data(FILE *dfp, int output_fd)
G.transferred += n; G.transferred += n;
progress_meter(PROGRESS_BUMP); progress_meter(PROGRESS_BUMP);
#endif #endif
if (G.got_clen) if (G.got_clen) {
G.content_len -= n; G.content_len -= n;
if (G.content_len == 0)
break;
}
} }
if (!G.chunked) if (!G.chunked)
@ -709,6 +712,11 @@ int wget_main(int argc UNUSED_PARAM, char **argv)
fprintf(sfp, "Host: %s\r\nUser-Agent: %s\r\n", fprintf(sfp, "Host: %s\r\nUser-Agent: %s\r\n",
target.host, user_agent); target.host, user_agent);
/* Ask server to close the connection as soon as we are done
* (IOW: we do not intend to send more requests)
*/
fprintf(sfp, "Connection: close\r\n");
#if ENABLE_FEATURE_WGET_AUTHENTICATION #if ENABLE_FEATURE_WGET_AUTHENTICATION
if (target.user) { if (target.user) {
fprintf(sfp, "Proxy-Authorization: Basic %s\r\n"+6, fprintf(sfp, "Proxy-Authorization: Basic %s\r\n"+6,
@ -722,22 +730,25 @@ int wget_main(int argc UNUSED_PARAM, char **argv)
if (G.beg_range) if (G.beg_range)
fprintf(sfp, "Range: bytes=%"OFF_FMT"u-\r\n", G.beg_range); fprintf(sfp, "Range: bytes=%"OFF_FMT"u-\r\n", G.beg_range);
#if ENABLE_FEATURE_WGET_LONG_OPTIONS #if ENABLE_FEATURE_WGET_LONG_OPTIONS
if (extra_headers) if (extra_headers)
fputs(extra_headers, sfp); fputs(extra_headers, sfp);
if (opt & WGET_OPT_POST_DATA) { if (opt & WGET_OPT_POST_DATA) {
char *estr = URL_escape(post_data); char *estr = URL_escape(post_data);
fprintf(sfp, "Content-Type: application/x-www-form-urlencoded\r\n"); fprintf(sfp,
fprintf(sfp, "Content-Length: %u\r\n" "\r\n" "%s", "Content-Type: application/x-www-form-urlencoded\r\n"
(int) strlen(estr), estr); "Content-Length: %u\r\n"
/*fprintf(sfp, "Connection: Keep-Alive\r\n\r\n");*/ "\r\n"
/*fprintf(sfp, "%s\r\n", estr);*/ "%s",
(int) strlen(estr), estr
);
free(estr); free(estr);
} else } else
#endif #endif
{ /* If "Connection:" is needed, document why */ {
fprintf(sfp, /* "Connection: close\r\n" */ "\r\n"); fprintf(sfp, "\r\n");
} }
fflush(sfp); fflush(sfp);