backout r3315 and test r->header_only last, since it's not actually

frequent here: 304 and HEAD responses are not set it before the filter
This commit is contained in:
Igor Sysoev 2009-12-07 15:41:57 +00:00
parent 8f7c8f3c07
commit 58b1f9e9e4

View File

@ -243,7 +243,6 @@ ngx_http_gzip_header_filter(ngx_http_request_t *r)
conf = ngx_http_get_module_loc_conf(r, ngx_http_gzip_filter_module);
if (!conf->enable
|| r->header_only
|| (r->headers_out.status != NGX_HTTP_OK
&& r->headers_out.status != NGX_HTTP_FORBIDDEN
&& r->headers_out.status != NGX_HTTP_NOT_FOUND)
@ -251,7 +250,8 @@ ngx_http_gzip_header_filter(ngx_http_request_t *r)
&& r->headers_out.content_encoding->value.len)
|| (r->headers_out.content_length_n != -1
&& r->headers_out.content_length_n < conf->min_length)
|| ngx_http_test_content_type(r, &conf->types) == NULL)
|| ngx_http_test_content_type(r, &conf->types) == NULL
|| r->header_only)
{
return ngx_http_next_header_filter(r);
}