Mercurial > hg > nginx
diff src/http/modules/ngx_http_proxy_module.c @ 3731:72cc5b789021
inherit proxy_pass, fastcgi_pass, uwsgi_pass, scgi_pass inside
a limit_except block if no handler was defined for the block
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 03 Aug 2010 09:24:25 +0000 |
parents | 4b773fc06336 |
children | 527a0f8cae2a |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_proxy_module.c Mon Aug 02 15:28:04 2010 +0000 +++ b/src/http/modules/ngx_http_proxy_module.c Tue Aug 03 09:24:25 2010 +0000 @@ -1720,6 +1720,7 @@ size_t size; ngx_keyval_t *s; ngx_hash_init_t hash; + ngx_http_core_loc_conf_t *clcf; ngx_http_proxy_redirect_t *pr; ngx_http_script_compile_t sc; @@ -2022,6 +2023,13 @@ conf->vars = prev->vars; } + 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) { + clcf->handler = ngx_http_proxy_handler; + conf->location = prev->location; + } + } if (conf->body_source.data == NULL) { conf->body_source = prev->body_source;