Mercurial > hg > nginx

comparison src/http/ngx_http_upstream.c @ 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 0d253659da12
children d22afd261e72
comparison
equal deleted inserted replaced
3054:a137de814516 3055:92b6cfaa3c27
437 if (u->conf->cache) { 437 if (u->conf->cache) {
438 ngx_int_t rc; 438 ngx_int_t rc;
439 439
440 rc = ngx_http_upstream_cache(r, u); 440 rc = ngx_http_upstream_cache(r, u);
441 441
442 if (rc == NGX_AGAIN) { 442 if (rc == NGX_BUSY) {
443 r->write_event_handler = ngx_http_upstream_init_request; 443 r->write_event_handler = ngx_http_upstream_init_request;
444 return; 444 return;
445 } 445 }
446
447 r->write_event_handler = ngx_http_request_empty_handler;
446 448
447 if (rc == NGX_DONE) { 449 if (rc == NGX_DONE) {
448 return; 450 return;
449 } 451 }
450 452
702 704
703 break; 705 break;
704 706
705 case NGX_AGAIN: 707 case NGX_AGAIN:
706 708
707 return NGX_AGAIN; 709 return NGX_BUSY;
708 710
709 case NGX_ERROR: 711 case NGX_ERROR:
710 712
711 return NGX_ERROR; 713 return NGX_ERROR;
712 714