diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2016-10-14 19:48:26 +0300 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2016-10-14 19:48:26 +0300 |
| commit | f5dcb06f28a813e4ee01a7ab25882bbfa8193eb3 (patch) | |
| tree | 19c0c9a8425bb824a3a9ec132a90d3f897ea5c71 /src | |
| parent | 71841601d2e98e875512bf626e04866fceb4c04c (diff) | |
| download | nginx-f5dcb06f28a813e4ee01a7ab25882bbfa8193eb3.tar.gz nginx-f5dcb06f28a813e4ee01a7ab25882bbfa8193eb3.zip | |
Upstream: hide_headers_hash inherited regardless of cache settings.
Dependency on cache settings existed prior to 2728c4e4a9ae (0.8.44)
as Set-Cookie header was automatically hidden from responses when
using cache. This is no longer the case, and hide_headers_hash can
be safely inherited regardless of cache settings.
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/ngx_http_upstream.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index ceb798fec..c2afa0cd5 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -6021,12 +6021,7 @@ ngx_http_upstream_hide_headers_hash(ngx_conf_t *cf, conf->hide_headers_hash = prev->hide_headers_hash; - if (conf->hide_headers_hash.buckets -#if (NGX_HTTP_CACHE) - && ((conf->cache == 0) == (prev->cache == 0)) -#endif - ) - { + if (conf->hide_headers_hash.buckets) { return NGX_OK; } |