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

httpd: if range is not specified, correctly fall back to read/write loop

Browse Source 
range_start was staying -1, and comparison meant to detect
"is it the first sendfile that failed, or not the first?"
was making incorrect decision. The result: nothing is sent.

function                                             old     new   delta
send_file_and_exit                                   865     877     +12

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2021-10-08 15:18:10 +02:00
parent 50c5b36dd7
commit 84874785c2
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
networking/httpd.c
View File

@ -1878,14 +1878,17 @@ static NOINLINE void send_file_and_exit(const char *url, int what)
send_headers(HTTP_OK); send_headers(HTTP_OK);
#if ENABLE_FEATURE_USE_SENDFILE #if ENABLE_FEATURE_USE_SENDFILE
{ {
off_t offset = (range_start < 0) ? 0 : range_start; off_t offset;
if (range_start < 0)
range_start = 0;
offset = range_start;
while (1) { while (1) {
/* sz is rounded down to 64k */ /* sz is rounded down to 64k */
ssize_t sz = MAXINT(ssize_t) - 0xffff; ssize_t sz = MAXINT(ssize_t) - 0xffff;
IF_FEATURE_HTTPD_RANGES(if (sz > range_len) sz = range_len;) IF_FEATURE_HTTPD_RANGES(if (sz > range_len) sz = range_len;)
count = sendfile(STDOUT_FILENO, fd, &offset, sz); count = sendfile(STDOUT_FILENO, fd, &offset, sz);
if (count < 0) { if (count < 0) {
if (offset == range_start) if (offset == range_start) /* was it the very 1st sendfile? */
break; /* fall back to read/write loop */ break; /* fall back to read/write loop */
goto fin; goto fin;
} }