From 83c93ba1093191ea73e894b747cc181168adb4f7 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Mon, 8 Jun 2009 12:33:11 +0000 Subject: 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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to '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 5f48a0c82..f0aadb402 100644 --- a/src/http/modules/ngx_http_proxy_module.c +++ b/src/http/modules/ngx_http_proxy_module.c @@ -2342,7 +2342,9 @@ ngx_http_proxy_merge_headers(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *conf, 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; } -- cgit