Mercurial > hg > nginx

comparison src/http/modules/ngx_http_proxy_module.c @ 3734:e3a6785b5be4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*) 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 f4c49c9e4bb5
comparison
equal deleted inserted replaced
3733:527a0f8cae2a 3734:e3a6785b5be4
1984 ngx_str_null(&pr->replacement.text); 1984 ngx_str_null(&pr->replacement.text);
1985 } 1985 }
1986 } 1986 }
1987 } 1987 }
1988 1988
1989 /* STUB */
1990 if (prev->proxy_lengths) {
1991 conf->proxy_lengths = prev->proxy_lengths;
1992 conf->proxy_values = prev->proxy_values;
1993 }
1994
1995 #if (NGX_HTTP_SSL) 1989 #if (NGX_HTTP_SSL)
1996 if (conf->upstream.ssl == NULL) { 1990 if (conf->upstream.ssl == NULL) {
1997 conf->upstream.ssl = prev->upstream.ssl; 1991 conf->upstream.ssl = prev->upstream.ssl;
1998 } 1992 }
1999 #endif 1993 #endif
2019 } 2013 }
2020 2014
2021 if (conf->upstream.upstream == NULL) { 2015 if (conf->upstream.upstream == NULL) {
2022 conf->upstream.upstream = prev->upstream.upstream; 2016 conf->upstream.upstream = prev->upstream.upstream;
2023 conf->vars = prev->vars; 2017 conf->vars = prev->vars;
2018 }
2019
2020 if (conf->proxy_lengths == NULL) {
2021 conf->proxy_lengths = prev->proxy_lengths;
2022 conf->proxy_values = prev->proxy_values;
2024 } 2023 }
2025 2024
2026 if (conf->upstream.upstream || conf->proxy_lengths) { 2025 if (conf->upstream.upstream || conf->proxy_lengths) {
2027 clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module); 2026 clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
2028 if (clcf->handler == NULL && clcf->lmt_excpt) { 2027 if (clcf->handler == NULL && clcf->lmt_excpt) {