Mercurial > hg > nginx
changeset 2891:76dfc19dcd49
do not set charset for subrequests
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 26 May 2009 09:38:48 +0000 |
parents | a4302032b831 |
children | 3e10e2b64007 |
files | src/http/modules/ngx_http_charset_filter_module.c |
diffstat | 1 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_charset_filter_module.c Mon May 25 19:57:25 2009 +0000 +++ b/src/http/modules/ngx_http_charset_filter_module.c Tue May 26 09:38:48 2009 +0000 @@ -252,10 +252,7 @@ "charset: \"%V\" > \"%V\"", &src, &dst); if (source_charset == NGX_HTTP_CHARSET_OFF) { - - if (r == r->main) { - ngx_http_set_charset(r, &dst); - } + ngx_http_set_charset(r, &dst); return ngx_http_next_header_filter(r); } @@ -488,6 +485,10 @@ static ngx_inline void ngx_http_set_charset(ngx_http_request_t *r, ngx_str_t *charset) { + if (r != r->main) { + return; + } + if (r->headers_out.status == NGX_HTTP_MOVED_PERMANENTLY || r->headers_out.status == NGX_HTTP_MOVED_TEMPORARILY) {