Merge busybox into merge

Fix merge conflict in coreutils/timeout.c.

1 files changed, 6 insertions, 1 deletions

diff --git a/networking/httpd.c b/networking/httpd.c
index 6cc189272..c9daa0638 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -1151,7 +1151,7 @@ static void send_headers(unsigned responseNum)
                         "Connection: close\r\n",
                         responseNum, responseString
 #if ENABLE_FEATURE_HTTPD_DATE
-                        ,date_str
+                        , date_str
 #endif
                 );
         }
@@ -1316,6 +1316,7 @@ static void send_headers_and_exit(int responseNum) NORETURN;
 static void send_headers_and_exit(int responseNum)
 {
         IF_FEATURE_HTTPD_GZIP(content_gzip = 0;)
+        file_size = -1; /* no Last-Modified:, ETag:, Content-Length: */
         send_headers(responseNum);
         log_and_exit();
 }
@@ -1919,9 +1920,13 @@ static NOINLINE void send_file_and_exit(const char *url, int what)
 #if ENABLE_FEATURE_USE_SENDFILE
         {
                 off_t offset;
+# if ENABLE_FEATURE_HTTPD_RANGES
                 if (range_start < 0)
                         range_start = 0;
                 offset = range_start;
+# else
+                offset = 0;
+# endif
                 while (1) {
                         /* sz is rounded down to 64k */
                         ssize_t sz = MAXINT(ssize_t) - 0xffff;