diff options
author | Igor Sysoev <igor@sysoev.ru> | 2010-08-03 09:24:25 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2010-08-03 09:24:25 +0000 |
commit | 90f95522a550cc9d8da7971af05d9f837788d19f (patch) | |
tree | 2114b0be896408bab4d6a6c4d0fd20dd8050055d /src/http/modules/ngx_http_scgi_module.c | |
parent | 0ec5492189447f46192aab5c3b2bae86f37ed8ac (diff) | |
download | nginx-90f95522a550cc9d8da7971af05d9f837788d19f.tar.gz nginx-90f95522a550cc9d8da7971af05d9f837788d19f.zip |
inherit proxy_pass, fastcgi_pass, uwsgi_pass, scgi_pass inside
a limit_except block if no handler was defined for the block
Diffstat (limited to 'src/http/modules/ngx_http_scgi_module.c')
-rw-r--r-- | src/http/modules/ngx_http_scgi_module.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/http/modules/ngx_http_scgi_module.c b/src/http/modules/ngx_http_scgi_module.c index 515b4aed8..d831e27c2 100644 --- a/src/http/modules/ngx_http_scgi_module.c +++ b/src/http/modules/ngx_http_scgi_module.c @@ -1053,6 +1053,7 @@ ngx_http_scgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) ngx_keyval_t *src; ngx_hash_key_t *hk; ngx_hash_init_t hash; + ngx_http_core_loc_conf_t *clcf; ngx_http_script_compile_t sc; ngx_http_script_copy_code_t *copy; @@ -1285,6 +1286,13 @@ ngx_http_scgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) conf->scgi_values = prev->scgi_values; } + if (conf->upstream.upstream || conf->scgi_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_scgi_handler; + } + } + if (conf->params_source == NULL) { conf->flushes = prev->flushes; conf->params_len = prev->params_len; |