From 824856fc10b5580fcd047fc8db0e4c3f133f60e6 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Tue, 12 Oct 2010 12:18:39 +0000 Subject: [PATCH] always update an aio_senfile connection flag accodring to a current location configuration, this clears the flag for requests passed via a keep-alive connection --- src/http/ngx_http_copy_filter_module.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/http/ngx_http_copy_filter_module.c b/src/http/ngx_http_copy_filter_module.c index 2dd4a627b..2eb6487d8 100644 --- a/src/http/ngx_http_copy_filter_module.c +++ b/src/http/ngx_http_copy_filter_module.c @@ -118,8 +118,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 && clcf->aio) { - ctx->aio_handler = ngx_http_copy_aio_handler; + if (ngx_file_aio) { + if (clcf->aio) { + ctx->aio_handler = ngx_http_copy_aio_handler; + } #if (NGX_HAVE_AIO_SENDFILE) c->aio_sendfile = (clcf->aio == NGX_HTTP_AIO_SENDFILE); #endif