Mercurial > hg > nginx-quic
changeset 3734:e3a6785b5be4
*) make code consistent to fastcgi, etc
*) remove STUB comment
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 03 Aug 2010 12:59:14 +0000 |
parents | 527a0f8cae2a |
children | 1ba712d077d1 |
files | src/http/modules/ngx_http_proxy_module.c |
diffstat | 1 files changed, 5 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_proxy_module.c +++ b/src/http/modules/ngx_http_proxy_module.c @@ -1986,12 +1986,6 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t } } - /* STUB */ - if (prev->proxy_lengths) { - conf->proxy_lengths = prev->proxy_lengths; - conf->proxy_values = prev->proxy_values; - } - #if (NGX_HTTP_SSL) if (conf->upstream.ssl == NULL) { conf->upstream.ssl = prev->upstream.ssl; @@ -2023,6 +2017,11 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t 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) { clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module); if (clcf->handler == NULL && clcf->lmt_excpt) {