From: Igor Sysoev <igor@sysoev.ru>
Date: Tue, 24 Mar 2009 12:31:24 +0000 (+0000)
Subject: unlink proxy_cache and proxy_cache_valid
X-Git-Tag: release-0.7.45~17
X-Git-Url: http://git.kaiwu.me/%7B@url%7D?a=commitdiff_plain;h=3a20e4a47716ccb5aab3cd962980b4c83034f911;p=nginx.git

unlink proxy_cache and proxy_cache_valid
---

diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index 680d77a58..13384766a 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -2068,10 +2068,6 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_ptr_value(conf->upstream.cache_valid,
                              prev->upstream.cache_valid, NULL);
 
-    if (conf->upstream.cache_valid == NULL) {
-        conf->upstream.cache = NULL;
-    }
-
 #endif
 
     if (conf->method.len == 0) {