Mercurial > hg > nginx
changeset 3337:44df6e76c28b stable-0.7
r3313 merge:
nginx sent gzipped responses to clients those do not support gzip,
if "gzip_static on" and "gzip_vary off"; the bug had been introduced in r3250
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 16 Nov 2009 15:16:47 +0000 |
parents | 11ec1c7a57e9 |
children | c6a9e05de301 |
files | src/http/modules/ngx_http_gzip_static_module.c |
diffstat | 1 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_gzip_static_module.c Mon Nov 16 15:13:02 2009 +0000 +++ b/src/http/modules/ngx_http_gzip_static_module.c Mon Nov 16 15:16:47 2009 +0000 @@ -99,9 +99,11 @@ return NGX_DECLINED; } + rc = ngx_http_gzip_ok(r); + clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); - if (clcf->gzip_vary && ngx_http_gzip_ok(r) != NGX_OK) { + if (!clcf->gzip_vary && rc != NGX_OK) { return NGX_DECLINED; } @@ -162,6 +164,10 @@ return NGX_DECLINED; } + if (rc != NGX_OK) { + return NGX_DECLINED; + } + ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0, "http static fd: %d", of.fd); if (of.is_dir) {