IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-22 15:13:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

*) make code consistent to fastcgi, etc

Browse Source 
*) remove STUB comment
This commit is contained in:
Igor Sysoev 2010-08-03 12:59:14 +00:00
parent e4994fbacb
commit 81cd5e4f6f
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/http/modules/ngx_http_proxy_module.c
View File

@ -1986,12 +1986,6 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
} }
} }
/* STUB */
if (prev->proxy_lengths) {
conf->proxy_lengths = prev->proxy_lengths;
conf->proxy_values = prev->proxy_values;
}
#if (NGX_HTTP_SSL) #if (NGX_HTTP_SSL)
if (conf->upstream.ssl == NULL) { if (conf->upstream.ssl == NULL) {
conf->upstream.ssl = prev->upstream.ssl; conf->upstream.ssl = prev->upstream.ssl;
@ -2023,6 +2017,11 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
conf->vars = prev->vars; conf->vars = prev->vars;
} }
if (conf->proxy_lengths == NULL) {
conf->proxy_lengths = prev->proxy_lengths;
conf->proxy_values = prev->proxy_values;
}
if (conf->upstream.upstream || conf->proxy_lengths) { if (conf->upstream.upstream || conf->proxy_lengths) {
clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module); clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
if (clcf->handler == NULL && clcf->lmt_excpt) { if (clcf->handler == NULL && clcf->lmt_excpt) {