Mercurial > hg > nginx-quic
changeset 2607:cb96a60c8f10
fix alias with variables, but without captures,
the bug had been introduced in r2566 and r2573
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 26 Mar 2009 15:24:19 +0000 |
parents | fd387fbb28c6 |
children | 2f4a3a4dfd34 |
files | src/http/ngx_http_core_module.c |
diffstat | 1 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -1695,7 +1695,15 @@ ngx_http_map_uri_to_path(ngx_http_reques last = ngx_copy(path->data, clcf->root.data, clcf->root.len); } else { - reserved += alias ? 1 : r->uri.len + 1; + +#if (NGX_PCRE) + ngx_uint_t captures; + + captures = alias && clcf->captures; + reserved += captures ? 1 : r->uri.len - alias + 1; +#else + reserved += r->uri.len - alias + 1; +#endif if (ngx_http_script_run(r, path, clcf->root_lengths->elts, reserved, clcf->root_values->elts) @@ -1711,10 +1719,12 @@ ngx_http_map_uri_to_path(ngx_http_reques *root_length = path->len - reserved; last = path->data + *root_length; - if (alias) { +#if (NGX_PCRE) + if (captures) { *last = '\0'; return last; } +#endif } last = ngx_cpystrn(last, r->uri.data + alias, r->uri.len - alias + 1);