aboutsummaryrefslogtreecommitdiff
path: root/networking/httpd.c
diff options
context:
space:
mode:
Diffstat (limited to 'networking/httpd.c')
-rw-r--r--networking/httpd.c7
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)
1151 "Connection: close\r\n", 1151 "Connection: close\r\n",
1152 responseNum, responseString 1152 responseNum, responseString
1153#if ENABLE_FEATURE_HTTPD_DATE 1153#if ENABLE_FEATURE_HTTPD_DATE
1154 ,date_str 1154 , date_str
1155#endif 1155#endif
1156 ); 1156 );
1157 } 1157 }
@@ -1316,6 +1316,7 @@ static void send_headers_and_exit(int responseNum) NORETURN;
1316static void send_headers_and_exit(int responseNum) 1316static void send_headers_and_exit(int responseNum)
1317{ 1317{
1318 IF_FEATURE_HTTPD_GZIP(content_gzip = 0;) 1318 IF_FEATURE_HTTPD_GZIP(content_gzip = 0;)
1319 file_size = -1; /* no Last-Modified:, ETag:, Content-Length: */
1319 send_headers(responseNum); 1320 send_headers(responseNum);
1320 log_and_exit(); 1321 log_and_exit();
1321} 1322}
@@ -1919,9 +1920,13 @@ static NOINLINE void send_file_and_exit(const char *url, int what)
1919#if ENABLE_FEATURE_USE_SENDFILE 1920#if ENABLE_FEATURE_USE_SENDFILE
1920 { 1921 {
1921 off_t offset; 1922 off_t offset;
1923# if ENABLE_FEATURE_HTTPD_RANGES
1922 if (range_start < 0) 1924 if (range_start < 0)
1923 range_start = 0; 1925 range_start = 0;
1924 offset = range_start; 1926 offset = range_start;
1927# else
1928 offset = 0;
1929# endif
1925 while (1) { 1930 while (1) {
1926 /* sz is rounded down to 64k */ 1931 /* sz is rounded down to 64k */
1927 ssize_t sz = MAXINT(ssize_t) - 0xffff; 1932 ssize_t sz = MAXINT(ssize_t) - 0xffff;