Mercurial > hg > nginx
comparison src/http/modules/ngx_http_uwsgi_module.c @ 6747:20eb4587225b
Upstream: handling of proxy_set_header at http level.
When headers are set at the "http" level and not redefined in
a server block, we now preserve conf->headers into the "http"
section configuration to inherit it to all servers.
The same applies to conf->headers_cache, though it may not be effective
if no servers use cache at the "server" level as conf->headers_cache
is only initialized if cache is enabled on a given level.
Similar changes made in fastcgi/scgi/uwsgi to preserve conf->params
and conf->params_cache.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Fri, 14 Oct 2016 19:48:26 +0300 |
parents | 04d8d1f85649 |
children | 1af120241cde |
comparison
equal
deleted
inserted
replaced
6746:63991ab67b3a | 6747:20eb4587225b |
---|---|
1818 } | 1818 } |
1819 } | 1819 } |
1820 | 1820 |
1821 #endif | 1821 #endif |
1822 | 1822 |
1823 /* | |
1824 * special handling to preserve conf->params in the "http" section | |
1825 * to inherit it to all servers | |
1826 */ | |
1827 | |
1828 if (prev->params.hash.buckets == NULL | |
1829 && conf->params_source == prev->params_source) | |
1830 { | |
1831 prev->params = conf->params; | |
1832 #if (NGX_HTTP_CACHE) | |
1833 prev->params_cache = conf->params_cache; | |
1834 #endif | |
1835 } | |
1836 | |
1823 return NGX_CONF_OK; | 1837 return NGX_CONF_OK; |
1824 } | 1838 } |
1825 | 1839 |
1826 | 1840 |
1827 static ngx_int_t | 1841 static ngx_int_t |