diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2006-11-14 12:43:14 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2006-11-14 12:43:14 +0000 |
| commit | e927b1e58a20c766cfb3f29250d20e35fa54278b (patch) | |
| tree | 050ad4598168a5b83007d2d1e7539b23d8d5379e /src/http/modules/ngx_http_proxy_module.c | |
| parent | 81188729e61ded55ea1b9c949fcb5c4e0c9fa23d (diff) | |
| download | nginx-e927b1e58a20c766cfb3f29250d20e35fa54278b.tar.gz nginx-e927b1e58a20c766cfb3f29250d20e35fa54278b.zip | |
allow proxy_pass inside limit_except
Diffstat (limited to 'src/http/modules/ngx_http_proxy_module.c')
| -rw-r--r-- | src/http/modules/ngx_http_proxy_module.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c index a9df3d735..f17f0a752 100644 --- a/src/http/modules/ngx_http_proxy_module.c +++ b/src/http/modules/ngx_http_proxy_module.c @@ -135,7 +135,7 @@ static ngx_conf_bitmask_t ngx_http_proxy_next_upstream_masks[] = { static ngx_command_t ngx_http_proxy_commands[] = { { ngx_string("proxy_pass"), - NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1, + NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_HTTP_LMT_CONF|NGX_CONF_TAKE1, ngx_http_proxy_pass, NGX_HTTP_LOC_CONF_OFFSET, 0, @@ -2207,8 +2207,9 @@ ngx_http_proxy_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) if (plcf->upstream.uri.len) { ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "\"proxy_pass\" may not have URI part in " - "location given by regular expression or " - "inside the \"if\" statement"); + "location given by regular expression, " + "or inside the \"if\" statement, " + "or inside the \"limit_except\" block"); return NGX_CONF_ERROR; } |