# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1237897884 0
# Node ID 377698b60999a10e115bcc0ba69913dcd91e84c9
# Parent  df5e99f6464b43d43950b8a6a0301e1316bb664c
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
--- 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
     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) {