diff src/http/ngx_http_copy_filter_module.c @ 6004:2dac6ae6d703

Deprecated "aio sendfile". Specifying "sendfile on" along with "aio on" activates the aio pre-loading mode for sendfile().
author Ruslan Ermilov <ru@nginx.com>
date Thu, 12 Mar 2015 20:06:04 +0300
parents ccad84a174e0
children 1fdba317ee6d
line wrap: on
line diff
--- a/src/http/ngx_http_copy_filter_module.c
+++ b/src/http/ngx_http_copy_filter_module.c
@@ -121,14 +121,10 @@ ngx_http_copy_filter(ngx_http_request_t 
         ctx->filter_ctx = r;
 
 #if (NGX_HAVE_FILE_AIO)
-        if (ngx_file_aio) {
-            if (clcf->aio) {
-                ctx->aio_handler = ngx_http_copy_aio_handler;
-            }
+        if (ngx_file_aio && clcf->aio) {
+            ctx->aio_handler = ngx_http_copy_aio_handler;
 #if (NGX_HAVE_AIO_SENDFILE)
-            if (clcf->aio == NGX_HTTP_AIO_SENDFILE) {
-                ctx->aio_preload = ngx_http_copy_aio_sendfile_preload;
-            }
+            ctx->aio_preload = ngx_http_copy_aio_sendfile_preload;
 #endif
         }
 #endif