From ef0fae4279b7190a9a24d15fc14be1bc59e7c344 Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Thu, 27 May 2010 13:24:19 +0000
Subject: [PATCH] do not add tested file to a location regex string, instead,
 set URI to the tested file, or keep URI unchanged, if the tested file is a
 directory, the later allows to handle a directory autoredirect

---
 src/http/ngx_http_core_module.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 997ed3a8d..a91d5854b 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -1282,6 +1282,12 @@ ngx_http_core_try_files_phase(ngx_http_request_t *r,
         if (!alias) {
             r->uri = path;
 
+#if (NGX_PCRE)
+        } else if (clcf->regex) {
+            if (!test_dir) {
+                r->uri = path;
+            }
+#endif
         } else {
             r->uri.len = alias + path.len;
             r->uri.data = ngx_pnalloc(r->pool, r->uri.len);