Mercurial > hg > nginx
changeset 3135:784126370092
nginx always sent "Vary: Accept-Encoding",
if both gzip_static and gzip_vary were on
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 15 Sep 2009 11:57:29 +0000 |
parents | e6f5cb5eff8b |
children | 47b7b6ac433e |
files | src/http/modules/ngx_http_gzip_static_module.c |
diffstat | 1 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_gzip_static_module.c Tue Sep 15 11:55:17 2009 +0000 +++ b/src/http/modules/ngx_http_gzip_static_module.c Tue Sep 15 11:57:29 2009 +0000 @@ -95,7 +95,13 @@ gzcf = ngx_http_get_module_loc_conf(r, ngx_http_gzip_static_module); - if (!gzcf->enable || ngx_http_gzip_ok(r) != NGX_OK) { + if (!gzcf->enable) { + return NGX_DECLINED; + } + + clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); + + if (clcf->gzip_vary && ngx_http_gzip_ok(r) != NGX_OK) { return NGX_DECLINED; } @@ -116,8 +122,6 @@ ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0, "http filename: \"%s\"", path.data); - clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); - ngx_memzero(&of, sizeof(ngx_open_file_info_t)); of.directio = clcf->directio; @@ -138,6 +142,7 @@ case NGX_ENOTDIR: case NGX_ENAMETOOLONG: + r->gzip = 0; return NGX_DECLINED; case NGX_EACCES: