commit e927b1e58a20c766cfb3f29250d20e35fa54278b
author Igor Sysoev <igor@sysoev.ru> Tue Nov 14 12:43:14 2006 +0000
committer Igor Sysoev <igor@sysoev.ru> Tue Nov 14 12:43:14 2006 +0000
tree 050ad4598168a5b83007d2d1e7539b23d8d5379e
parent 81188729e61ded55ea1b9c949fcb5c4e0c9fa23d

allow proxy_pass inside limit_except

src/http/modules/ngx_http_proxy_module.c

diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index a9df3d7..f17f0a7 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_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 @@
         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;
         }