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
This commit is contained in:
parent
0980938054
commit
971e495c55
|
@ -99,9 +99,11 @@ ngx_http_gzip_static_handler(ngx_http_request_t *r)
|
||||||
return NGX_DECLINED;
|
return NGX_DECLINED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
rc = ngx_http_gzip_ok(r);
|
||||||
|
|
||||||
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
|
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;
|
return NGX_DECLINED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -162,6 +164,10 @@ ngx_http_gzip_static_handler(ngx_http_request_t *r)
|
||||||
return NGX_DECLINED;
|
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);
|
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0, "http static fd: %d", of.fd);
|
||||||
|
|
||||||
if (of.is_dir) {
|
if (of.is_dir) {
|
||||||
|
|
Loading…
Reference in New Issue