From: Igor Sysoev <igor@sysoev.ru>
Date: Tue, 26 May 2009 09:38:48 +0000 (+0000)
Subject: do not set charset for subrequests
X-Git-Tag: release-0.8.0~22
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=77adc0d6c272af9e7d1a49277388520cb80934c7;p=nginx.git

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
index b9620dd9d..5f47ec6d1 100644
--- 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_request_t *r)
                    "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 *r, ngx_str_t *name)
 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)
     {