mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-12 21:52:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix reserved mapped uri length if alias has captures

Browse Source
This commit is contained in:
Igor Sysoev 2009-03-14 19:20:34 +00:00
parent 51ed97f79f
commit bb7d615b3c
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/http/ngx_http_core_module.c
View File

@ -1672,13 +1672,11 @@ ngx_http_map_uri_to_path(ngx_http_request_t *r, ngx_str_t *path,
return NULL; return NULL;
} }
reserved += r->uri.len - alias + 1;
if (clcf->root_lengths == NULL) { if (clcf->root_lengths == NULL) {
*root_length = clcf->root.len; *root_length = clcf->root.len;
path->len = clcf->root.len + reserved; path->len = clcf->root.len + reserved + r->uri.len - alias + 1;
path->data = ngx_pnalloc(r->pool, path->len); path->data = ngx_pnalloc(r->pool, path->len);
if (path->data == NULL) { if (path->data == NULL) {
@ -1688,7 +1686,7 @@ ngx_http_map_uri_to_path(ngx_http_request_t *r, ngx_str_t *path,
last = ngx_copy(path->data, clcf->root.data, clcf->root.len); last = ngx_copy(path->data, clcf->root.data, clcf->root.len);
} else { } else {
if (ngx_http_script_run(r, path, clcf->root_lengths->elts, reserved, if (ngx_http_script_run(r, path, clcf->root_lengths->elts, ++reserved,
clcf->root_values->elts) clcf->root_values->elts)
== NULL) == NULL)
{ {