diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-08-03 12:59:14 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-08-03 12:59:14 +0000 |
| commit | 81cd5e4f6f5d3b9255466b81ca7a2ff1e8b08ac7 (patch) | |
| tree | 72c00e52e92db77292a5d15398fe992f02832e35 /src/http/modules/ngx_http_proxy_module.c | |
| parent | e4994fbacb8a8f1496fb980aa0ec0ff1d5916525 (diff) | |
| download | nginx-81cd5e4f6f5d3b9255466b81ca7a2ff1e8b08ac7.tar.gz nginx-81cd5e4f6f5d3b9255466b81ca7a2ff1e8b08ac7.zip | |
*) make code consistent to fastcgi, etc
*) remove STUB comment
Diffstat (limited to 'src/http/modules/ngx_http_proxy_module.c')
| -rw-r--r-- | src/http/modules/ngx_http_proxy_module.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c index e311bb9d3..325a1a00b 100644 --- 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 *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 (conf->upstream.ssl == NULL) { 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; } + 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) { |