diff options
Diffstat (limited to 'networking')
| -rw-r--r-- | networking/Config.src | 8 | ||||
| -rw-r--r-- | networking/httpd.c | 6 |
2 files changed, 3 insertions, 11 deletions
diff --git a/networking/Config.src b/networking/Config.src index e56646917..15a696876 100644 --- a/networking/Config.src +++ b/networking/Config.src @@ -181,14 +181,6 @@ config FEATURE_HTTPD_RANGES "Range: bytes=NNN-[MMM]" header. Allows for resuming interrupted downloads, seeking in multimedia players etc. -config FEATURE_HTTPD_USE_SENDFILE - bool "Use sendfile system call" - default y - depends on HTTPD - help - When enabled, httpd will use the kernel sendfile() function - instead of read/write loop. - config FEATURE_HTTPD_SETUID bool "Enable -u <user> option" default y diff --git a/networking/httpd.c b/networking/httpd.c index 621d9cddc..9cf080401 100644 --- a/networking/httpd.c +++ b/networking/httpd.c @@ -133,7 +133,7 @@ # include <security/pam_appl.h> # include <security/pam_misc.h> #endif -#if ENABLE_FEATURE_HTTPD_USE_SENDFILE +#if ENABLE_FEATURE_USE_SENDFILE # include <sys/sendfile.h> #endif /* amount of buffering in a pipe */ @@ -1624,7 +1624,7 @@ static NOINLINE void send_file_and_exit(const char *url, int what) #endif if (what & SEND_HEADERS) send_headers(HTTP_OK); -#if ENABLE_FEATURE_HTTPD_USE_SENDFILE +#if ENABLE_FEATURE_USE_SENDFILE { off_t offset = range_start; while (1) { @@ -1654,7 +1654,7 @@ static NOINLINE void send_file_and_exit(const char *url, int what) break; } if (count < 0) { - IF_FEATURE_HTTPD_USE_SENDFILE(fin:) + IF_FEATURE_USE_SENDFILE(fin:) if (verbose > 1) bb_perror_msg("error"); } |