# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1243330728 0
# Node ID 76dfc19dcd49f67377a705d72adda3fb9a30d754
# Parent  a4302032b8313798ca219b94ffd08484c9bd850d
do not set charset for subrequests

diff --git a/src/http/modules/ngx_http_charset_filter_module.c b/src/http/modules/ngx_http_charset_filter_module.c
--- a/src/http/modules/ngx_http_charset_filter_module.c
+++ b/src/http/modules/ngx_http_charset_filter_module.c
@@ -252,10 +252,7 @@ ngx_http_charset_header_filter(ngx_http_
                    "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 @@ ngx_http_get_charset(ngx_http_request_t 
 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)
     {