commit 83c93ba1093191ea73e894b747cc181168adb4f7
author Igor Sysoev <igor@sysoev.ru> Mon Jun 08 12:33:11 2009 +0000
committer Igor Sysoev <igor@sysoev.ru> Mon Jun 08 12:33:11 2009 +0000
tree 05ce44ec6a750838a4a1da278bfb736e2dc372d3
parent 2d65078eff03defa7c852a72b48d89393dbd50d3

inherit proxy_set_header, proxy_hide_header, and fastcgi_hide_header
only if cache settings are similar

src/http/modules/ngx_http_proxy_module.c

diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index 5f48a0c..f0aadb4 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -2342,7 +2342,9 @@
         conf->headers_source = prev->headers_source;
     }
 
-    if (conf->headers_set_hash.buckets) {
+    if (conf->headers_set_hash.buckets
+        && ((conf->upstream.cache == NULL) == (prev->upstream.cache == NULL)))
+    {
         return NGX_OK;
     }
 

src/http/ngx_http_upstream.c

diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 7470845..87df571 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -4085,7 +4085,9 @@
     {
         conf->hide_headers_hash = prev->hide_headers_hash;
 
-        if (conf->hide_headers_hash.buckets) {
+        if (conf->hide_headers_hash.buckets
+            && ((conf->cache == NULL) == (prev->cache == NULL)))
+        {
             return NGX_OK;
         }