diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-07-14 11:15:45 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-07-14 11:15:45 +0000 |
| commit | f3870c66df0c79b6da45b2a49d113d45456c04d5 (patch) | |
| tree | 4655598f33abe951f3552acc34f6485906137aff /src/http/ngx_http_upstream.c | |
| parent | 7fc29052e8e8e3c26b208813d0fbc3dd2090ca1d (diff) | |
| download | nginx-f3870c66df0c79b6da45b2a49d113d45456c04d5.tar.gz nginx-f3870c66df0c79b6da45b2a49d113d45456c04d5.tar.bz2 | |
use ngx_http_test_predicates(), ngx_http_set_predicate_slot()
delete ngx_http_cache(), ngx_http_no_cache_set_slot()
Diffstat (limited to '')
| -rw-r--r-- | src/http/ngx_http_upstream.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index 44b8b947c..ede6d2ad5 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -633,11 +633,9 @@ ngx_http_upstream_cache(ngx_http_request_t *r, ngx_http_upstream_t *u) if (c == NULL) { - if (u->conf->no_cache) { - rc = ngx_http_cache(r, u->conf->no_cache); - if (rc != NGX_OK) { - return rc; - } + rc = ngx_http_test_predicates(r, u->conf->no_cache); + if (rc != NGX_OK) { + return rc; } if (!(r->method & u->conf->cache_methods)) { |