aboutsummaryrefslogtreecommitdiff
path: root/src/http/modules/ngx_http_uwsgi_module.c
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2010-08-03 09:24:25 +0000
committerIgor Sysoev <igor@sysoev.ru>2010-08-03 09:24:25 +0000
commit90f95522a550cc9d8da7971af05d9f837788d19f (patch)
tree2114b0be896408bab4d6a6c4d0fd20dd8050055d /src/http/modules/ngx_http_uwsgi_module.c
parent0ec5492189447f46192aab5c3b2bae86f37ed8ac (diff)
downloadnginx-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_uwsgi_module.c')
-rw-r--r--src/http/modules/ngx_http_uwsgi_module.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/http/modules/ngx_http_uwsgi_module.c b/src/http/modules/ngx_http_uwsgi_module.c
index 7899d97dd..a2529131b 100644
--- a/src/http/modules/ngx_http_uwsgi_module.c
+++ b/src/http/modules/ngx_http_uwsgi_module.c
@@ -1106,6 +1106,7 @@ ngx_http_uwsgi_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;
@@ -1340,6 +1341,13 @@ ngx_http_uwsgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
conf->uwsgi_values = prev->uwsgi_values;
}
+ if (conf->upstream.upstream || conf->uwsgi_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_uwsgi_handler;
+ }
+ }
+
ngx_conf_merge_uint_value(conf->modifier1, prev->modifier1, 0);
ngx_conf_merge_uint_value(conf->modifier2, prev->modifier2, 0);