]> git.kaiwu.me - nginx.git/commitdiff
fix sending a cached file using AIO
authorIgor Sysoev <igor@sysoev.ru>
Fri, 28 Aug 2009 11:22:27 +0000 (11:22 +0000)
committerIgor Sysoev <igor@sysoev.ru>
Fri, 28 Aug 2009 11:22:27 +0000 (11:22 +0000)
src/http/ngx_http_upstream.c

index 11a2cc6d4d721b129b0ba9c13c4e27da2fc01d50..6dcebd0a5843449cc4bf0eb5312da1ff60fe842b 100644 (file)
@@ -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: