Mercurial > hg > nginx

comparison src/http/modules/ngx_http_gzip_static_module.c @ 3441:b0fbe6ab9ebe stable-0.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Igor Sysoev <igor@sysoev.ru>
date Mon, 01 Feb 2010 15:54:02 +0000
parents 44df6e76c28b
children 8944c3e318ab
comparison
equal deleted inserted replaced
3440:88741ec7731a 3441:b0fbe6ab9ebe
142 142
143 case NGX_ENOENT: 143 case NGX_ENOENT:
144 case NGX_ENOTDIR: 144 case NGX_ENOTDIR:
145 case NGX_ENAMETOOLONG: 145 case NGX_ENAMETOOLONG:
146 146
147 r->gzip = 0;
148 return NGX_DECLINED; 147 return NGX_DECLINED;
149 148
150 case NGX_EACCES: 149 case NGX_EACCES:
151 150
152 level = NGX_LOG_ERR; 151 level = NGX_LOG_ERR;
161 ngx_log_error(level, log, of.err, 160 ngx_log_error(level, log, of.err,
162 "%s \"%s\" failed", of.failed, path.data); 161 "%s \"%s\" failed", of.failed, path.data);
163 162
164 return NGX_DECLINED; 163 return NGX_DECLINED;
165 } 164 }
165
166 r->gzip_vary = 1;
166 167
167 if (rc != NGX_OK) { 168 if (rc != NGX_OK) {
168 return NGX_DECLINED; 169 return NGX_DECLINED;
169 } 170 }
170 171