Mercurial > hg > nginx
changeset 2038:93a0d80fdce6
add args in redirect to a directory
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 26 May 2008 18:57:43 +0000 |
parents | aee889ff25ea |
children | 4d8140271204 |
files | src/http/modules/ngx_http_static_module.c |
diffstat | 1 files changed, 19 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_static_module.c Mon May 26 18:49:36 2008 +0000 +++ b/src/http/modules/ngx_http_static_module.c Mon May 26 18:57:43 2008 +0000 @@ -48,7 +48,7 @@ ngx_http_static_handler(ngx_http_request_t *r) { u_char *last, *location; - size_t root; + size_t root, len; ngx_str_t path; ngx_int_t rc; ngx_uint_t level; @@ -150,26 +150,39 @@ return NGX_HTTP_INTERNAL_SERVER_ERROR; } - if (!clcf->alias && clcf->root_lengths == NULL) { + len = r->uri.len + 1; + + if (!clcf->alias && clcf->root_lengths == NULL && r->args.len == 0) { location = path.data + clcf->root.len; + *last = '/'; + } else { - location = ngx_palloc(r->pool, r->uri.len + 1); + if (r->args.len) { + len += r->args.len + 1; + } + + location = ngx_palloc(r->pool, len); if (location == NULL) { return NGX_HTTP_INTERNAL_SERVER_ERROR; } last = ngx_copy(location, r->uri.data, r->uri.len); - } + + *last = '/'; - *last = '/'; + if (r->args.len) { + *++last = '?'; + ngx_memcpy(++last, r->args.data, r->args.len); + } + } /* * we do not need to set the r->headers_out.location->hash and * r->headers_out.location->key fields */ - r->headers_out.location->value.len = r->uri.len + 1; + r->headers_out.location->value.len = len; r->headers_out.location->value.data = location; return NGX_HTTP_MOVED_PERMANENTLY;