Mercurial > hg > nginx
comparison src/http/modules/ngx_http_not_modified_filter_module.c @ 3441:b0fbe6ab9ebe stable-0.7
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 | eace65d6092b |
| children | e6e453203bae |
comparison
equal
deleted
inserted
replaced
| 3440:88741ec7731a | 3441:b0fbe6ab9ebe |
|---|---|
| 86 r->headers_out.status_line.len = 0; | 86 r->headers_out.status_line.len = 0; |
| 87 r->headers_out.content_type.len = 0; | 87 r->headers_out.content_type.len = 0; |
| 88 ngx_http_clear_content_length(r); | 88 ngx_http_clear_content_length(r); |
| 89 ngx_http_clear_accept_ranges(r); | 89 ngx_http_clear_accept_ranges(r); |
| 90 | 90 |
| 91 if (r->headers_out.content_encoding) { | |
| 92 r->headers_out.content_encoding->hash = 0; | |
| 93 r->headers_out.content_encoding = NULL; | |
| 94 } | |
| 95 | |
| 91 return ngx_http_next_header_filter(r); | 96 return ngx_http_next_header_filter(r); |
| 92 } | 97 } |
| 93 | 98 |
| 94 | 99 |
| 95 static ngx_int_t | 100 static ngx_int_t |