Mercurial > hg > nginx

diff src/http/modules/ngx_http_proxy_module.c @ 1395:bf5b86d5f00e stable-0.5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
r1354 merge: named location
author Igor Sysoev <igor@sysoev.ru>
date Tue, 14 Aug 2007 20:02:09 +0000
parents d59617e7e6a1
children 840b81d13a2f
line wrap: on
line diff
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -2275,13 +2275,17 @@ ngx_http_proxy_pass(ngx_conf_t *cf, ngx_
 
     plcf->upstream.location = clcf->name;
 
+    if (clcf->named
 #if (NGX_PCRE)
-
-    if (clcf->regex || clcf->noname) {
+        || clcf->regex
+#endif
+        || clcf->noname)
+    {
         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 named location, "
                                "or inside the \"if\" statement, "
                                "or inside the \"limit_except\" block");
             return NGX_CONF_ERROR;
@@ -2290,8 +2294,6 @@ ngx_http_proxy_pass(ngx_conf_t *cf, ngx_
         plcf->upstream.location.len = 0;
     }
 
-#endif
-
     plcf->upstream.url = *url;
 
     if (clcf->name.data[clcf->name.len - 1] == '/') {