commit 4cc7e16fc0973fff3393f7621f3b8d718b1a7158
author Valentin Bartenev <vbart@nginx.com> Wed Jan 28 21:33:06 2015 +0300
committer Valentin Bartenev <vbart@nginx.com> Wed Jan 28 21:33:06 2015 +0300
tree d9aaed6b97bfd6c50d0041a13bcf15b73ecf5cac
parent afa38fcd12a501ab5d91c100f826d960e00c61ee

Fixed AIO handling in the output chain.

The ctx->aio flag must be taken into account in the short path too.

src/core/ngx_output_chain.c

diff --git a/src/core/ngx_output_chain.c b/src/core/ngx_output_chain.c
index 3cb60ea..9d7a846 100644
--- a/src/core/ngx_output_chain.c
+++ b/src/core/ngx_output_chain.c
@@ -45,8 +45,12 @@
     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