# HG changeset patch # User Valentin Bartenev # Date 1422469986 -10800 # Node ID bcdfc39bf44dade60fedb7b200ca5d3d10bfb22a # Parent 78271500b8ded9d9cc3ccc5f36d4c41f4e32a4a7 Fixed AIO handling in the output chain. The ctx->aio flag must be taken into account in the short path too. diff --git a/src/core/ngx_output_chain.c b/src/core/ngx_output_chain.c --- a/src/core/ngx_output_chain.c +++ b/src/core/ngx_output_chain.c @@ -45,8 +45,12 @@ ngx_output_chain(ngx_output_chain_ctx_t ngx_int_t rc, last; ngx_chain_t *cl, *out, **last_out; - if (ctx->in == NULL && ctx->busy == NULL) { - + if (ctx->in == NULL && ctx->busy == NULL +#if (NGX_HAVE_FILE_AIO) + && !ctx->aio +#endif + ) + { /* * the short path for the case when the ctx->in and ctx->busy chains * are empty, the incoming chain is empty too or has the single buf