diff options
-rw-r--r-- | networking/httpd.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/networking/httpd.c b/networking/httpd.c index c038293e3..31c8489d3 100644 --- a/networking/httpd.c +++ b/networking/httpd.c | |||
@@ -1878,14 +1878,17 @@ static NOINLINE void send_file_and_exit(const char *url, int what) | |||
1878 | send_headers(HTTP_OK); | 1878 | send_headers(HTTP_OK); |
1879 | #if ENABLE_FEATURE_USE_SENDFILE | 1879 | #if ENABLE_FEATURE_USE_SENDFILE |
1880 | { | 1880 | { |
1881 | off_t offset = (range_start < 0) ? 0 : range_start; | 1881 | off_t offset; |
1882 | if (range_start < 0) | ||
1883 | range_start = 0; | ||
1884 | offset = range_start; | ||
1882 | while (1) { | 1885 | while (1) { |
1883 | /* sz is rounded down to 64k */ | 1886 | /* sz is rounded down to 64k */ |
1884 | ssize_t sz = MAXINT(ssize_t) - 0xffff; | 1887 | ssize_t sz = MAXINT(ssize_t) - 0xffff; |
1885 | IF_FEATURE_HTTPD_RANGES(if (sz > range_len) sz = range_len;) | 1888 | IF_FEATURE_HTTPD_RANGES(if (sz > range_len) sz = range_len;) |
1886 | count = sendfile(STDOUT_FILENO, fd, &offset, sz); | 1889 | count = sendfile(STDOUT_FILENO, fd, &offset, sz); |
1887 | if (count < 0) { | 1890 | if (count < 0) { |
1888 | if (offset == range_start) | 1891 | if (offset == range_start) /* was it the very 1st sendfile? */ |
1889 | break; /* fall back to read/write loop */ | 1892 | break; /* fall back to read/write loop */ |
1890 | goto fin; | 1893 | goto fin; |
1891 | } | 1894 | } |