diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-02-01 15:54:02 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-02-01 15:54:02 +0000 |
| commit | afbfc8b4513a663d90cf0728633b8430fe691030 (patch) | |
| tree | d649f3222e846e2afb731112651da8427fd7cfc7 /src/http/modules/ngx_http_gzip_static_module.c | |
| parent | c419414db440c298006d814936de28964d654b38 (diff) | |
| download | nginx-afbfc8b4513a663d90cf0728633b8430fe691030.tar.gz nginx-afbfc8b4513a663d90cf0728633b8430fe691030.tar.bz2 | |
merge r3309, r3314, r3315, r3380:
gzip headers related fixes:
*) remove "Content-Encoding: gzip" in 304 response
sent by ngx_http_gzip_static_module
*) refactor gzip_vary handling
*) test r->header_only last, since it's not actually
frequent here: 304 and HEAD responses are not set it before the filter
Diffstat (limited to 'src/http/modules/ngx_http_gzip_static_module.c')
| -rw-r--r-- | src/http/modules/ngx_http_gzip_static_module.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/http/modules/ngx_http_gzip_static_module.c b/src/http/modules/ngx_http_gzip_static_module.c index 45ab6aaa2..29874a33a 100644 --- a/src/http/modules/ngx_http_gzip_static_module.c +++ b/src/http/modules/ngx_http_gzip_static_module.c @@ -144,7 +144,6 @@ ngx_http_gzip_static_handler(ngx_http_request_t *r) case NGX_ENOTDIR: case NGX_ENAMETOOLONG: - r->gzip = 0; return NGX_DECLINED; case NGX_EACCES: @@ -164,6 +163,8 @@ ngx_http_gzip_static_handler(ngx_http_request_t *r) return NGX_DECLINED; } + r->gzip_vary = 1; + if (rc != NGX_OK) { return NGX_DECLINED; } |