Mercurial > hg > nginx
comparison src/http/ngx_http_upstream.c @ 3692:045ea40cbfe8
use ngx_http_test_predicates(), ngx_http_set_predicate_slot()
delete ngx_http_cache(), ngx_http_no_cache_set_slot()
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Wed, 14 Jul 2010 11:15:45 +0000 |
parents | 1f5841b1fcd7 |
children | 3c442bd5597b |
comparison
equal
deleted
inserted
replaced
3691:55f95e91daed | 3692:045ea40cbfe8 |
---|---|
631 | 631 |
632 c = r->cache; | 632 c = r->cache; |
633 | 633 |
634 if (c == NULL) { | 634 if (c == NULL) { |
635 | 635 |
636 if (u->conf->no_cache) { | 636 rc = ngx_http_test_predicates(r, u->conf->no_cache); |
637 rc = ngx_http_cache(r, u->conf->no_cache); | 637 if (rc != NGX_OK) { |
638 if (rc != NGX_OK) { | 638 return rc; |
639 return rc; | |
640 } | |
641 } | 639 } |
642 | 640 |
643 if (!(r->method & u->conf->cache_methods)) { | 641 if (!(r->method & u->conf->cache_methods)) { |
644 return NGX_DECLINED; | 642 return NGX_DECLINED; |
645 } | 643 } |