Mercurial > hg > nginx

comparison src/http/modules/ngx_http_proxy_module.c @ 843:ebab9490204c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow proxy_pass inside limit_except
author Igor Sysoev <igor@sysoev.ru>
date Tue, 14 Nov 2006 12:43:14 +0000
parents 3298810a0198
children 4d68c486fcb0
comparison
equal deleted inserted replaced
842:d8e2613a2b55 843:ebab9490204c
133 133
134 134
135 static ngx_command_t ngx_http_proxy_commands[] = { 135 static ngx_command_t ngx_http_proxy_commands[] = {
136 136
137 { ngx_string("proxy_pass"), 137 { ngx_string("proxy_pass"),
138 NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1, 138 NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_HTTP_LMT_CONF|NGX_CONF_TAKE1,
139 ngx_http_proxy_pass, 139 ngx_http_proxy_pass,
140 NGX_HTTP_LOC_CONF_OFFSET, 140 NGX_HTTP_LOC_CONF_OFFSET,
141 0, 141 0,
142 NULL }, 142 NULL },
143 143
2205 2205
2206 if (clcf->regex || clcf->noname) { 2206 if (clcf->regex || clcf->noname) {
2207 if (plcf->upstream.uri.len) { 2207 if (plcf->upstream.uri.len) {
2208 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 2208 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
2209 "\"proxy_pass\" may not have URI part in " 2209 "\"proxy_pass\" may not have URI part in "
2210 "location given by regular expression or " 2210 "location given by regular expression, "
2211 "inside the \"if\" statement"); 2211 "or inside the \"if\" statement, "
2212 "or inside the \"limit_except\" block");
2212 return NGX_CONF_ERROR; 2213 return NGX_CONF_ERROR;
2213 } 2214 }
2214 2215
2215 plcf->upstream.location.len = 0; 2216 plcf->upstream.location.len = 0;
2216 } 2217 }