Mercurial > hg > nginx
changeset 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 | cf2f8d91cf09 |
children | d84f0abd4a53 |
files | src/http/ngx_http_copy_filter_module.c src/http/ngx_http_core_module.c src/http/ngx_http_core_module.h |
diffstat | 3 files changed, 4 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http_copy_filter_module.c Wed Mar 04 08:12:53 2015 +0300 +++ b/src/http/ngx_http_copy_filter_module.c Thu Mar 12 20:06:04 2015 +0300 @@ -121,14 +121,10 @@ 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
--- a/src/http/ngx_http_core_module.c Wed Mar 04 08:12:53 2015 +0300 +++ b/src/http/ngx_http_core_module.c Thu Mar 12 20:06:04 2015 +0300 @@ -120,7 +120,7 @@ { 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 } };