Mercurial > hg > nginx

changeset 3636:446f611b0a79

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 /".
author Igor Sysoev <igor@sysoev.ru>
date Fri, 18 Jun 2010 15:38:31 +0000
parents c0113b6648de
children d656caa72ec9
files src/http/ngx_http_core_module.c
diffstat 1 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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_h
 
         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 */