mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-17 09:13:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Deprecated "aio sendfile".

Browse Source 
Specifying "sendfile on" along with "aio on" activates the
aio pre-loading mode for sendfile().
This commit is contained in:
Ruslan Ermilov 2015-03-12 20:06:04 +03:00
parent 5e5540f7dc
commit 067de7dde1
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/http/ngx_http_copy_filter_module.c
View File

@ -121,14 +121,10 @@ ngx_http_copy_filter(ngx_http_request_t *r, ngx_chain_t *in)
ctx->filter_ctx = r; ctx->filter_ctx = r;
#if (NGX_HAVE_FILE_AIO) #if (NGX_HAVE_FILE_AIO)
if (ngx_file_aio) { if (ngx_file_aio && clcf->aio) {
if (clcf->aio) {
ctx->aio_handler = ngx_http_copy_aio_handler; ctx->aio_handler = ngx_http_copy_aio_handler;
}
#if (NGX_HAVE_AIO_SENDFILE) #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
} }
#endif #endif

2
src/http/ngx_http_core_module.c
View File

@ -120,7 +120,7 @@ static ngx_conf_enum_t ngx_http_core_aio[] = {
{ ngx_string("off"), NGX_HTTP_AIO_OFF }, { ngx_string("off"), NGX_HTTP_AIO_OFF },
{ ngx_string("on"), NGX_HTTP_AIO_ON }, { ngx_string("on"), NGX_HTTP_AIO_ON },
#if (NGX_HAVE_AIO_SENDFILE) #if (NGX_HAVE_AIO_SENDFILE)
{ ngx_string("sendfile"), NGX_HTTP_AIO_SENDFILE }, { ngx_string("sendfile"), NGX_HTTP_AIO_ON },
#endif #endif
{ ngx_null_string, 0 } { ngx_null_string, 0 }
}; };

1
src/http/ngx_http_core_module.h
View File

@ -27,7 +27,6 @@
#define NGX_HTTP_AIO_OFF 0 #define NGX_HTTP_AIO_OFF 0
#define NGX_HTTP_AIO_ON 1 #define NGX_HTTP_AIO_ON 1
#define NGX_HTTP_AIO_SENDFILE 2
#define NGX_HTTP_SATISFY_ALL 0 #define NGX_HTTP_SATISFY_ALL 0