diff options
author | Igor Sysoev <igor@sysoev.ru> | 2009-05-25 23:57:25 +0400 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2009-05-25 23:57:25 +0400 |
commit | 4b14a97b653cc9f9572de9bd7885caf7e597cdb5 (patch) | |
tree | 65660cbf124d059c2265790db19972f73f596fb9 /src | |
parent | d1d8cd587ba5ebbf92e3254ef9d6029195611ad1 (diff) |
fix the previous commit
Diffstat (limited to 'src')
-rw-r--r-- | src/http/modules/ngx_http_charset_filter_module.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/http/modules/ngx_http_charset_filter_module.c b/src/http/modules/ngx_http_charset_filter_module.c index d77fe883a..b9620dd9d 100644 --- a/src/http/modules/ngx_http_charset_filter_module.c +++ b/src/http/modules/ngx_http_charset_filter_module.c @@ -288,7 +288,7 @@ ngx_http_charset_header_filter(ngx_http_request_t *r) 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 @@ ngx_http_main_request_charset(ngx_http_request_t *r, ngx_str_t *src) ctx->charset = charset; ctx->charset_name = *main_charset; + *src = *main_charset; return charset; } @@ -518,6 +519,7 @@ ngx_http_charset_ctx(ngx_http_request_t *r, ngx_http_charset_t *charsets, 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; |