Mercurial > hg > nginx

changeset 1234:6be3d9073266

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
forbid alias inside location given by regular expression
author Igor Sysoev <igor@sysoev.ru>
date Mon, 04 Jun 2007 20:45:45 +0000
parents 754f3648642d
children f8a40ccafb04
files src/http/ngx_http_core_module.c
diffstat 1 files changed, 12 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -2674,6 +2674,18 @@ ngx_http_core_root(ngx_conf_t *cf, ngx_c
         return NGX_CONF_ERROR;
     }
 
+#if (NGX_PCRE)
+
+    if (lcf->regex && alias) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "the \"alias\" directive may not be used "
+                           "inside location given by regular expression");
+
+        return NGX_CONF_ERROR;
+    }
+
+#endif
+
     value = cf->args->elts;
 
     if (ngx_strstr(value[1].data, "$document_root")