Mercurial > hg > nginx

changeset 3055:92b6cfaa3c27

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix sending a cached file using AIO
author Igor Sysoev <igor@sysoev.ru>
date Fri, 28 Aug 2009 11:22:27 +0000
parents a137de814516
children d22afd261e72
files src/http/ngx_http_upstream.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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_
 
         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
 
     case NGX_AGAIN:
 
-        return NGX_AGAIN;
+        return NGX_BUSY;
 
     case NGX_ERROR: