From: Igor Sysoev <igor@sysoev.ru>
Date: Fri, 28 Aug 2009 11:22:27 +0000 (+0000)
Subject: fix sending a cached file using AIO
X-Git-Tag: release-0.8.11~3
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=a39d4e1aeee5e6608c5ffc5cb3e02877e41515a9;p=nginx.git

fix sending a cached file using AIO
---

diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 11a2cc6d4..6dcebd0a5 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -439,11 +439,13 @@ ngx_http_upstream_init_request(ngx_http_request_t *r)
 
         rc = ngx_http_upstream_cache(r, u);
 
-        if (rc == NGX_AGAIN) {
+        if (rc == NGX_BUSY) {
             r->write_event_handler = ngx_http_upstream_init_request;
             return;
         }
 
+        r->write_event_handler = ngx_http_request_empty_handler;
+
         if (rc == NGX_DONE) {
             return;
         }
@@ -704,7 +706,7 @@ ngx_http_upstream_cache(ngx_http_request_t *r, ngx_http_upstream_t *u)
 
     case NGX_AGAIN:
 
-        return NGX_AGAIN;
+        return NGX_BUSY;
 
     case NGX_ERROR: