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 /".
This commit is contained in:
Igor Sysoev 2010-06-18 15:38:31 +00:00
parent 88948dcdf3
commit 276042367d
1 changed files with 8 additions and 3 deletions

View File

@ -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 */