From: Igor Sysoev <igor@sysoev.ru>
Date: Fri, 18 Jun 2010 15:38:31 +0000 (+0000)
Subject: Test regex location if URI matches exactly to non-exact location.
X-Git-Tag: release-0.8.42~2
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=4115de9fe3bcc21c1595e5ffb6e9a1c72030bc66;p=nginx.git

Test regex location if URI matches exactly to non-exact location.

Revert a feature introduced in r2028. The feature confuses mostly,
the only gain was not to test regex for a frequent request such as
"/" in "locaiton /".
---

diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 637feabe9..984d30617 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -1590,9 +1590,14 @@ ngx_http_core_find_static_location(ngx_http_request_t *r,
 
         if (len == (size_t) node->len) {
 
-            r->loc_conf = (node->exact) ? node->exact->loc_conf:
-                                          node->inclusive->loc_conf;
-            return NGX_OK;
+            if (node->exact) {
+                r->loc_conf = node->exact->loc_conf;
+                return NGX_OK;
+
+            } else {
+                r->loc_conf = node->inclusive->loc_conf;
+                return NGX_AGAIN;
+            }
         }
 
         /* len < node->len */