Mercurial > hg > nginx

diff src/http/ngx_http_upstream.c @ 3692:045ea40cbfe8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/src/http/ngx_http_upstream.c	Wed Jul 14 11:13:59 2010 +0000
+++ b/src/http/ngx_http_upstream.c	Wed Jul 14 11:15:45 2010 +0000
@@ -633,11 +633,9 @@
 
     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)) {