Mercurial > hg > nginx-quic
comparison src/http/modules/ngx_http_scgi_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 | 1d0e03db9f8e |
children | 1af120241cde |
comparison
equal
deleted
inserted
replaced
6746:63991ab67b3a | 6747:20eb4587225b |
---|---|
1556 } | 1556 } |
1557 } | 1557 } |
1558 | 1558 |
1559 #endif | 1559 #endif |
1560 | 1560 |
1561 /* | |
1562 * special handling to preserve conf->params in the "http" section | |
1563 * to inherit it to all servers | |
1564 */ | |
1565 | |
1566 if (prev->params.hash.buckets == NULL | |
1567 && conf->params_source == prev->params_source) | |
1568 { | |
1569 prev->params = conf->params; | |
1570 #if (NGX_HTTP_CACHE) | |
1571 prev->params_cache = conf->params_cache; | |
1572 #endif | |
1573 } | |
1574 | |
1561 return NGX_CONF_OK; | 1575 return NGX_CONF_OK; |
1562 } | 1576 } |
1563 | 1577 |
1564 | 1578 |
1565 static ngx_int_t | 1579 static ngx_int_t |