Mercurial > hg > nginx

changeset 2345:d8992339584e stable-0.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
r2051 merge: disable charset if there is "Content-Encoding" header
author Igor Sysoev <igor@sysoev.ru>
date Thu, 27 Nov 2008 14:06:46 +0000
parents 2eaf0d8f2990
children b274942c09c3
files src/http/modules/ngx_http_charset_filter_module.c
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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);
         }