diff options
author | Igor Sysoev <igor@sysoev.ru> | 2007-09-22 23:10:53 +0400 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2007-09-22 23:10:53 +0400 |
commit | 571e8566facc520653aac9ecb1bac6373a9c36f4 (patch) | |
tree | e125275425693b3b23c066a1a6d30fd1ca035dcc /src/http | |
parent | 2c7cb74b9feb4b5337b374e5873f64f930a4960c (diff) |
r1404 merge:
auto redirect lost arguments
Diffstat (limited to 'src/http')
-rw-r--r-- | src/http/ngx_http_core_module.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index b2b0f3bca..c7fa92ceb 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -620,6 +620,8 @@ ngx_int_t ngx_http_core_find_config_phase(ngx_http_request_t *r, ngx_http_phase_handler_t *ph) { + u_char *p; + size_t len; ngx_int_t rc; ngx_http_core_loc_conf_t *clcf; ngx_http_core_srv_conf_t *cscf; @@ -680,7 +682,25 @@ ngx_http_core_find_config_phase(ngx_http_request_t *r, * r->headers_out.location->key fields */ - r->headers_out.location->value = clcf->name; + if (r->args.len == 0) { + r->headers_out.location->value = clcf->name; + + } else { + len = clcf->name.len + 1 + r->args.len; + p = ngx_palloc(r->pool, len); + + if (p == NULL) { + ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); + return NGX_OK; + } + + r->headers_out.location->value.len = len; + r->headers_out.location->value.data = p; + + p = ngx_cpymem(p, clcf->name.data, clcf->name.len); + *p++ = '?'; + ngx_memcpy(p, r->args.data, r->args.len); + } ngx_http_finalize_request(r, NGX_HTTP_MOVED_PERMANENTLY); return NGX_OK; |