diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2015-03-12 20:06:04 +0300 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2015-03-12 20:06:04 +0300 |
| commit | 067de7dde1fe60c70f7094bf79466692bf1d6887 (patch) | |
| tree | 3cf010a0c71a4194d90152517d3970792a635981 /src | |
| parent | 5e5540f7dccec44b0be89eabe245befb509032fc (diff) | |
| download | nginx-067de7dde1fe60c70f7094bf79466692bf1d6887.tar.gz nginx-067de7dde1fe60c70f7094bf79466692bf1d6887.zip | |
Deprecated "aio sendfile".
Specifying "sendfile on" along with "aio on" activates the
aio pre-loading mode for sendfile().
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/ngx_http_copy_filter_module.c | 10 | ||||
| -rw-r--r-- | src/http/ngx_http_core_module.c | 2 | ||||
| -rw-r--r-- | src/http/ngx_http_core_module.h | 1 |
3 files changed, 4 insertions, 9 deletions
diff --git a/src/http/ngx_http_copy_filter_module.c b/src/http/ngx_http_copy_filter_module.c index cdd7fceb6..8e6a199a7 100644 --- 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 0542b2871..bb2c1df52 100644 --- 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 fc2c3d49b..258393db2 100644 --- 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 |