comparison src/http/ngx_http_copy_filter_module.c @ 578:f3a9e57d2e17

Merge with current.
author Maxim Dounin <mdounin@mdounin.ru>
date Thu, 11 Mar 2010 21:27:17 +0300
parents 2b9e388c61f1
children 8246d8a2c2be
comparison
equal deleted inserted replaced
539:5f4de8cf0d9d 578:f3a9e57d2e17
116 116
117 ctx->output_filter = (ngx_output_chain_filter_pt) ngx_http_next_filter; 117 ctx->output_filter = (ngx_output_chain_filter_pt) ngx_http_next_filter;
118 ctx->filter_ctx = r; 118 ctx->filter_ctx = r;
119 119
120 #if (NGX_HAVE_FILE_AIO) 120 #if (NGX_HAVE_FILE_AIO)
121 if (clcf->aio) { 121 if (ngx_file_aio && clcf->aio) {
122 ctx->aio_handler = ngx_http_copy_aio_handler; 122 ctx->aio_handler = ngx_http_copy_aio_handler;
123 #if (NGX_HAVE_AIO_SENDFILE) 123 #if (NGX_HAVE_AIO_SENDFILE)
124 c->aio_sendfile = (clcf->aio == NGX_HTTP_AIO_SENDFILE); 124 c->aio_sendfile = (clcf->aio == NGX_HTTP_AIO_SENDFILE);
125 #endif 125 #endif
126 } 126 }