Mercurial > hg > nginx
changeset 3534:3711bb1336c3
fix a try_files/alias case when alias uses captures and
try_files .html "" / =404;
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 27 May 2010 13:44:22 +0000 |
parents | bb5376f3f585 |
children | abb3901be800 |
files | src/http/ngx_http_core_module.c src/http/ngx_http_request.h |
diffstat | 2 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -1286,6 +1286,7 @@ ngx_http_core_try_files_phase(ngx_http_r } else if (clcf->regex) { if (!test_dir) { r->uri = path; + r->add_uri_to_alias = 1; } #endif } else { @@ -1783,7 +1784,9 @@ ngx_http_map_uri_to_path(ngx_http_reques ngx_uint_t captures; captures = alias && clcf->regex; - reserved += captures ? 1 : r->uri.len - alias + 1; + + reserved += captures ? r->add_uri_to_alias ? r->uri.len + 1 : 1 + : r->uri.len - alias + 1; #else reserved += r->uri.len - alias + 1; #endif @@ -1804,8 +1807,12 @@ ngx_http_map_uri_to_path(ngx_http_reques #if (NGX_PCRE) if (captures) { - *last = '\0'; - return last; + if (!r->add_uri_to_alias) { + *last = '\0'; + return last; + } + + alias = 0; } #endif } @@ -2213,6 +2220,7 @@ ngx_http_internal_redirect(ngx_http_requ #endif r->internal = 1; + r->add_uri_to_alias = 0; r->main->count++; ngx_http_handler(r);