comparison src/http/modules/ngx_http_fastcgi_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
3125 } 3125 }
3126 } 3126 }
3127 3127
3128 #endif 3128 #endif
3129 3129
3130 /*
3131 * special handling to preserve conf->params in the "http" section
3132 * to inherit it to all servers
3133 */
3134
3135 if (prev->params.hash.buckets == NULL
3136 && conf->params_source == prev->params_source)
3137 {
3138 prev->params = conf->params;
3139 #if (NGX_HTTP_CACHE)
3140 prev->params_cache = conf->params_cache;
3141 #endif
3142 }
3143
3130 return NGX_CONF_OK; 3144 return NGX_CONF_OK;
3131 } 3145 }
3132 3146
3133 3147
3134 static ngx_int_t 3148 static ngx_int_t