mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-07-25 22:56:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed: proxy_redirect with regex might broke Refresh header.

Browse Source 
The problem was localized in ngx_http_proxy_rewrite_redirect_regex() handler
function which did not take into account prefix when overwriting header value.
This commit is contained in:
Valentin Bartenev 2012-01-10 15:09:45 +00:00
parent d55ce18c95
commit b8ef9d9255
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/http/modules/ngx_http_proxy_module.c
View File

@ -2348,6 +2348,8 @@ static ngx_int_t
ngx_http_proxy_rewrite_redirect_regex(ngx_http_request_t *r, ngx_table_elt_t *h, 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 prefix, ngx_http_proxy_redirect_t *pr)
{ {
size_t len;
u_char *data;
ngx_str_t redirect, replacement; ngx_str_t redirect, replacement;
redirect.len = h->value.len - prefix; redirect.len = h->value.len - prefix;
@ -2361,7 +2363,23 @@ ngx_http_proxy_rewrite_redirect_regex(ngx_http_request_t *r, ngx_table_elt_t *h,
return NGX_ERROR; 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; return NGX_OK;
} }