comparison src/http/modules/ngx_http_charset_filter_module.c @ 2345:d8992339584e stable-0.6

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 be6c9033a798
children 8e4b9d2acde8
comparison
equal deleted inserted replaced
2344:2eaf0d8f2990 2345:d8992339584e
202 202
203 /* destination charset */ 203 /* destination charset */
204 204
205 if (r == r->main) { 205 if (r == r->main) {
206 206
207 if (r->headers_out.content_encoding
208 && r->headers_out.content_encoding->value.len)
209 {
210 return ngx_http_next_header_filter(r);
211 }
212
207 if (r->headers_out.content_type.len == 0) { 213 if (r->headers_out.content_type.len == 0) {
208 return ngx_http_next_header_filter(r); 214 return ngx_http_next_header_filter(r);
209 } 215 }
210 216
211 if (r->headers_out.override_charset 217 if (r->headers_out.override_charset