Mercurial > hg > nginx
comparison src/http/ngx_http_upstream.c @ 6744:7e5199f172fb
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.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Fri, 14 Oct 2016 19:48:26 +0300 |
| parents | 29bf0dbc0a77 |
| children | 93121485c39b |
comparison
equal
deleted
inserted
replaced
| 6743:7fc16ff7ddc4 | 6744:7e5199f172fb |
|---|---|
| 6019 conf->hide_headers = prev->hide_headers; | 6019 conf->hide_headers = prev->hide_headers; |
| 6020 conf->pass_headers = prev->pass_headers; | 6020 conf->pass_headers = prev->pass_headers; |
| 6021 | 6021 |
| 6022 conf->hide_headers_hash = prev->hide_headers_hash; | 6022 conf->hide_headers_hash = prev->hide_headers_hash; |
| 6023 | 6023 |
| 6024 if (conf->hide_headers_hash.buckets | 6024 if (conf->hide_headers_hash.buckets) { |
| 6025 #if (NGX_HTTP_CACHE) | |
| 6026 && ((conf->cache == 0) == (prev->cache == 0)) | |
| 6027 #endif | |
| 6028 ) | |
| 6029 { | |
| 6030 return NGX_OK; | 6025 return NGX_OK; |
| 6031 } | 6026 } |
| 6032 | 6027 |
| 6033 } else { | 6028 } else { |
| 6034 if (conf->hide_headers == NGX_CONF_UNSET_PTR) { | 6029 if (conf->hide_headers == NGX_CONF_UNSET_PTR) { |