diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-08-28 11:22:27 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-08-28 11:22:27 +0000 |
| commit | a39d4e1aeee5e6608c5ffc5cb3e02877e41515a9 (patch) | |
| tree | b957b433adcb9bca0882273dc400bc0a4268bbd0 | |
| parent | aa4200b551f591fb61cd38d1015f2935eaaa20ac (diff) | |
| download | nginx-a39d4e1aeee5e6608c5ffc5cb3e02877e41515a9.tar.gz nginx-a39d4e1aeee5e6608c5ffc5cb3e02877e41515a9.tar.bz2 | |
fix sending a cached file using AIO
| -rw-r--r-- | src/http/ngx_http_upstream.c | 6 |
1 files changed, 4 insertions, 2 deletions
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: |