Mercurial > hg > nginx
changeset 2890:a4302032b831
fix the previous commit
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 25 May 2009 19:57:25 +0000 |
parents | 0bb8c54f4c45 |
children | 76dfc19dcd49 |
files | src/http/modules/ngx_http_charset_filter_module.c |
diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_charset_filter_module.c Mon May 25 15:57:43 2009 +0000 +++ b/src/http/modules/ngx_http_charset_filter_module.c Mon May 25 19:57:25 2009 +0000 @@ -288,7 +288,7 @@ ngx_http_set_charset(r, &dst); - if (source_charset == charset) { + if (source_charset != charset) { return ngx_http_charset_ctx(r, charsets, charset, source_charset); } @@ -410,6 +410,7 @@ ctx->charset = charset; ctx->charset_name = *main_charset; + *src = *main_charset; return charset; } @@ -518,6 +519,7 @@ ctx->table = charsets[source_charset].tables[charset]; ctx->charset = charset; + ctx->charset_name = charsets[charset].name; ctx->length = charsets[charset].length; ctx->from_utf8 = charsets[source_charset].utf8; ctx->to_utf8 = charsets[charset].utf8;