Mercurial > hg > nginx
diff src/http/ngx_http_copy_filter_module.c @ 3053:0d253659da12
directio_alignment
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Fri, 28 Aug 2009 08:15:55 +0000 |
parents | 6060225e9261 |
children | aa720192937b |
line wrap: on
line diff
--- a/src/http/ngx_http_copy_filter_module.c Fri Aug 28 08:12:35 2009 +0000 +++ b/src/http/ngx_http_copy_filter_module.c Fri Aug 28 08:15:55 2009 +0000 @@ -94,8 +94,6 @@ ctx = ngx_http_get_module_ctx(r, ngx_http_copy_filter_module); if (ctx == NULL) { - conf = ngx_http_get_module_loc_conf(r, ngx_http_copy_filter_module); - ctx = ngx_pcalloc(r->pool, sizeof(ngx_output_chain_ctx_t)); if (ctx == NULL) { return NGX_ERROR; @@ -103,11 +101,16 @@ ngx_http_set_ctx(r, ctx, ngx_http_copy_filter_module); + conf = ngx_http_get_module_loc_conf(r, ngx_http_copy_filter_module); + clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); + ctx->sendfile = c->sendfile; ctx->need_in_memory = r->main_filter_need_in_memory || r->filter_need_in_memory; ctx->need_in_temp = r->filter_need_temporary; + ctx->alignment = clcf->directio_alignment; + ctx->pool = r->pool; ctx->bufs = conf->bufs; ctx->tag = (ngx_buf_tag_t) &ngx_http_copy_filter_module; @@ -116,7 +119,6 @@ ctx->filter_ctx = r; #if (NGX_HAVE_FILE_AIO) - clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); if (clcf->aio) { ctx->aio = ngx_http_copy_aio_handler; }