Mercurial > hg > nginx
changeset 4398:3d51ba7f347b
Fixed: proxy_redirect with regex might broke Refresh header.
The problem was localized in ngx_http_proxy_rewrite_redirect_regex() handler
function which did not take into account prefix when overwriting header value.
author | Valentin Bartenev <vbart@nginx.com> |
---|---|
date | Tue, 10 Jan 2012 15:09:45 +0000 |
parents | d3000365ac65 |
children | d2b3130fd8d9 |
files | src/http/modules/ngx_http_proxy_module.c |
diffstat | 1 files changed, 19 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_proxy_module.c Tue Jan 10 07:28:32 2012 +0000 +++ b/src/http/modules/ngx_http_proxy_module.c Tue Jan 10 15:09:45 2012 +0000 @@ -2348,6 +2348,8 @@ ngx_http_proxy_rewrite_redirect_regex(ngx_http_request_t *r, ngx_table_elt_t *h, size_t prefix, ngx_http_proxy_redirect_t *pr) { + size_t len; + u_char *data; ngx_str_t redirect, replacement; redirect.len = h->value.len - prefix; @@ -2361,7 +2363,23 @@ return NGX_ERROR; } - h->value = replacement; + if (!prefix) { + h->value = replacement; + return NGX_OK; + } + + len = prefix + replacement.len; + + data = ngx_pnalloc(r->pool, len); + if (data == NULL) { + return NGX_ERROR; + } + + ngx_memcpy(data, h->value.data, prefix); + ngx_memcpy(data + prefix, replacement.data, replacement.len); + + h->value.len = len; + h->value.data = data; return NGX_OK; }