From: Valentin Bartenev <vbart@nginx.com>
Date: Wed, 28 Jan 2015 18:33:06 +0000 (+0300)
Subject: Fixed AIO handling in the output chain.
X-Git-Url: http://git.kaiwu.me/postgresql/log/contrib/postgres_fdw/postgres_fdw.c?a=commitdiff_plain;h=314d0d40e75498431ab4d0bc772a41957fb6736c;p=nginx.git

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
index 3cb60ea73..9d7a8460f 100644
--- 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 *ctx, ngx_chain_t *in)
     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