diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2008-11-27 14:06:46 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2008-11-27 14:06:46 +0000 |
| commit | 0c078f3749fd497a6eea46c090e2892045c650ff (patch) | |
| tree | bd63f48a6ddd87231258c22b8c072c02b5358220 /src | |
| parent | 02269b3f820049e100abd8d8a67a2d79738a42e4 (diff) | |
| download | nginx-0c078f3749fd497a6eea46c090e2892045c650ff.tar.gz nginx-0c078f3749fd497a6eea46c090e2892045c650ff.tar.bz2 | |
r2051 merge:
disable charset if there is "Content-Encoding" header
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/modules/ngx_http_charset_filter_module.c | 6 |
1 files changed, 6 insertions, 0 deletions
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); } |