comparison src/http/modules/ngx_http_gzip_filter_module.c @ 1611:d5db0e96bcc6 stable-0.5

r1542, r1543, r1544, r1549, r1550, r1551, r1555 merge: *) ngx_strstrn() and ngx_strcasestrn() *) fix memcached END test
author Igor Sysoev <igor@sysoev.ru>
date Mon, 29 Oct 2007 14:52:51 +0000
parents 3b763d36e055
children 6b81bbc36eaf
comparison
equal deleted inserted replaced
1610:f5e9d597a751 1611:d5db0e96bcc6
277 || (r->headers_out.content_encoding 277 || (r->headers_out.content_encoding
278 && r->headers_out.content_encoding->value.len) 278 && r->headers_out.content_encoding->value.len)
279 || r->headers_in.accept_encoding == NULL 279 || r->headers_in.accept_encoding == NULL
280 || (r->headers_out.content_length_n != -1 280 || (r->headers_out.content_length_n != -1
281 && r->headers_out.content_length_n < conf->min_length) 281 && r->headers_out.content_length_n < conf->min_length)
282 || ngx_strstr(r->headers_in.accept_encoding->value.data, "gzip") == NULL 282 || ngx_strcasestrn(r->headers_in.accept_encoding->value.data,
283 "gzip", 4 - 1)
284 == NULL
283 ) 285 )
284 { 286 {
285 return ngx_http_next_header_filter(r); 287 return ngx_http_next_header_filter(r);
286 } 288 }
287 289