nginx always sent "Vary: Accept-Encoding",

if both gzip_static and gzip_vary were on
This commit is contained in:
Igor Sysoev 2009-09-15 11:57:29 +00:00
parent 4428cfc12b
commit 04c2f085f4

View File

@ -95,7 +95,13 @@ ngx_http_gzip_static_handler(ngx_http_request_t *r)
gzcf = ngx_http_get_module_loc_conf(r, ngx_http_gzip_static_module); 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; return NGX_DECLINED;
} }
@ -116,8 +122,6 @@ ngx_http_gzip_static_handler(ngx_http_request_t *r)
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0, ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0,
"http filename: \"%s\"", path.data); "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)); ngx_memzero(&of, sizeof(ngx_open_file_info_t));
of.directio = clcf->directio; of.directio = clcf->directio;
@ -138,6 +142,7 @@ ngx_http_gzip_static_handler(ngx_http_request_t *r)
case NGX_ENOTDIR: case NGX_ENOTDIR:
case NGX_ENAMETOOLONG: case NGX_ENAMETOOLONG:
r->gzip = 0;
return NGX_DECLINED; return NGX_DECLINED;
case NGX_EACCES: case NGX_EACCES: