From: Igor Sysoev <igor@sysoev.ru>
Date: Thu, 27 Nov 2008 14:06:46 +0000 (+0000)
Subject: r2051 merge:
X-Git-Tag: release-0.6.34~10
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=0c078f3749fd497a6eea46c090e2892045c650ff;p=nginx.git

r2051 merge:

disable charset if there is "Content-Encoding" header
---

diff --git a/src/http/modules/ngx_http_charset_filter_module.c b/src/http/modules/ngx_http_charset_filter_module.c
index 850e64e75..a5db2d878 100644
--- a/src/http/modules/ngx_http_charset_filter_module.c
+++ b/src/http/modules/ngx_http_charset_filter_module.c
@@ -204,6 +204,12 @@ ngx_http_charset_header_filter(ngx_http_request_t *r)
 
     if (r == r->main) {
 
+        if (r->headers_out.content_encoding
+            && r->headers_out.content_encoding->value.len)
+        {
+            return ngx_http_next_header_filter(r);
+        }
+
         if (r->headers_out.content_type.len == 0) {
             return ngx_http_next_header_filter(r);
         }