Deprecated "aio sendfile".

Specifying "sendfile on" along with "aio on" activates the
aio pre-loading mode for sendfile().

diff --git a/src/http/ngx_http_copy_filter_module.c b/src/http/ngx_http_copy_filter_module.c
index cdd7fceb619ed7241196f1ae8cab92c8bb467297..8e6a199a7affb3ca528328db971ba4cc53ed13c7 100644 (file)
--- 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 *r, ngx_chain_t *in)
         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

diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 0542b2871211fc6cfe111e8a568c3435e7be06f1..bb2c1df5201db3e0030836d16b76bc851b6d4f9d 100644 (file)
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -120,7 +120,7 @@ static ngx_conf_enum_t  ngx_http_core_aio[] = {
     { ngx_string("off"), NGX_HTTP_AIO_OFF  },
     { ngx_string("on"), NGX_HTTP_AIO_ON },
 #if (NGX_HAVE_AIO_SENDFILE)
-    { ngx_string("sendfile"), NGX_HTTP_AIO_SENDFILE },
+    { ngx_string("sendfile"), NGX_HTTP_AIO_ON },
 #endif
     { ngx_null_string, 0 }
 };

diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h
index fc2c3d49bf3ebd2289055266fd947bd95eadff4e..258393db2af252b416eb3dae463e93a9b8e00bd0 100644 (file)
--- a/src/http/ngx_http_core_module.h
+++ b/src/http/ngx_http_core_module.h
@@ -27,7 +27,6 @@
 
 #define NGX_HTTP_AIO_OFF                0
 #define NGX_HTTP_AIO_ON                 1
-#define NGX_HTTP_AIO_SENDFILE           2
 
 
 #define NGX_HTTP_SATISFY_ALL            0