# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1227794806 0
# Node ID d8992339584e72954dc98c6411cb54b5f424c9d9
# Parent  2eaf0d8f299061ff2a421d8997ea96d5bd826e83
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
--- 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_
 
     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);
         }