1 files changed, 23 insertions, 16 deletions

diff --git a/src/os/unix/ngx_aio_write_chain.c b/src/os/unix/ngx_aio_write_chain.c
index b12afec41..b8760b0fa 100644
--- a/src/os/unix/ngx_aio_write_chain.c
+++ b/src/os/unix/ngx_aio_write_chain.c
@@ -1,6 +1,7 @@
 
 #include <ngx_config.h>
 #include <ngx_core.h>
+#include <ngx_event.h>
 #include <ngx_aio.h>
 
 
@@ -17,10 +18,18 @@ ngx_chain_t *ngx_aio_write_chain(ngx_connection_t *c, ngx_chain_t *in)
     ce = in;
 
     while (ce) {
+
+        /* we can post the single aio operation only */
+
+        if (c->write->active) {
+            return ce;
+        }
+
         buf = prev = ce->hunk->pos;
         size = 0;
 
         /* coalesce the neighbouring chain entries */
+
         while (ce && prev == ce->hunk->pos) {
             size += ce->hunk->last - ce->hunk->pos;
             prev = ce->hunk->last;
@@ -33,34 +42,32 @@ ngx_chain_t *ngx_aio_write_chain(ngx_connection_t *c, ngx_chain_t *in)
         ngx_log_debug(c->log, "aio_write rc: %d" _ rc);
 #endif
 
+        if (rc == NGX_ERROR) {
+            return NGX_CHAIN_ERROR;
+        }
+
         if (rc > 0) {
             sent += rc;
             c->sent += rc;
-
-        } else if (rc == NGX_ERROR) {
-            return NGX_CHAIN_ERROR;
-
-        } else if (rc == NGX_AGAIN) {
-            break;
         }
-    }
 
 #if (NGX_DEBUG_WRITE_CHAIN)
-    ngx_log_debug(c->log, "aio_write sent: " OFF_FMT _ c->sent);
+        ngx_log_debug(c->log, "aio_write sent: " OFF_FMT _ c->sent);
 #endif
 
-    for (ce = in; ce; ce = ce->next) {
+        for (ce = in; ce; ce = ce->next) {
 
-        if (sent >= ce->hunk->last - ce->hunk->pos) {
-            sent -= ce->hunk->last - ce->hunk->pos;
-            ce->hunk->pos = ce->hunk->last;
+            if (sent >= ce->hunk->last - ce->hunk->pos) {
+                sent -= ce->hunk->last - ce->hunk->pos;
+                ce->hunk->pos = ce->hunk->last;
 
-            continue;
-        }
+                continue;
+            }
 
-        ce->hunk->pos += sent;
+            ce->hunk->pos += sent;
 
-        break;
+            break;
+        }
     }
 
     return ce;