diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-10-26 17:34:43 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-10-26 17:34:43 +0000 |
| commit | 6427b81842aea67417d64832c13fe2b0413ddc77 (patch) | |
| tree | 98e7936ff810dbb616b4a18e27d82fb2c3b2c293 /src/http/ngx_http_request.c | |
| parent | efdaec7003e37933e113b009407f2a62df2ec78a (diff) | |
| download | nginx-6427b81842aea67417d64832c13fe2b0413ddc77.tar.gz nginx-6427b81842aea67417d64832c13fe2b0413ddc77.tar.bz2 | |
merge r3055, r3136:
gzip related fixes:
*) do not disable gzip for MSIE 6.0 SV1 in "gzip_disable msie6"
*) nginx always sent "Vary: Accept-Encoding",
if both gzip_static and gzip_vary were on
Diffstat (limited to '')
| -rw-r--r-- | src/http/ngx_http_request.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c index d1733d66c..13b069226 100644 --- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -1378,8 +1378,13 @@ ngx_http_process_user_agent(ngx_http_request_t *r, ngx_table_elt_t *h, r->headers_in.msie4 = 1; /* fall through */ case '5': - case '6': r->headers_in.msie6 = 1; + break; + case '6': + if (ngx_strstrn(msie + 8, "SV1", 3 - 1) == NULL) { + r->headers_in.msie6 = 1; + } + break; } } |