Mercurial > hg > nginx
comparison src/http/ngx_http_request.c @ 4040:0094c8636d5f stable-1.0
Merge of r3979, r3980, r3981, r3983, r3987, r3994, r3995:
Accept-Encoding refactoring:
*) "gzip; q=0" support
*) and removal of ancient MSIE 4.x test for gzip
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 29 Aug 2011 10:39:23 +0000 |
parents | e3cb8e27e413 |
children | 77604e9a1ed8 d9b486dbf7e5 |
comparison
equal
deleted
inserted
replaced
4039:ee270f311dea | 4040:0094c8636d5f |
---|---|
1437 | 1437 |
1438 if (msie[6] == '.') { | 1438 if (msie[6] == '.') { |
1439 | 1439 |
1440 switch (msie[5]) { | 1440 switch (msie[5]) { |
1441 case '4': | 1441 case '4': |
1442 r->headers_in.msie4 = 1; | |
1443 /* fall through */ | |
1444 case '5': | 1442 case '5': |
1445 r->headers_in.msie6 = 1; | 1443 r->headers_in.msie6 = 1; |
1446 break; | 1444 break; |
1447 case '6': | 1445 case '6': |
1448 if (ngx_strstrn(msie + 8, "SV1", 3 - 1) == NULL) { | 1446 if (ngx_strstrn(msie + 8, "SV1", 3 - 1) == NULL) { |
1461 } | 1459 } |
1462 | 1460 |
1463 if (ngx_strstrn(user_agent, "Opera", 5 - 1)) { | 1461 if (ngx_strstrn(user_agent, "Opera", 5 - 1)) { |
1464 r->headers_in.opera = 1; | 1462 r->headers_in.opera = 1; |
1465 r->headers_in.msie = 0; | 1463 r->headers_in.msie = 0; |
1466 r->headers_in.msie4 = 0; | |
1467 r->headers_in.msie6 = 0; | 1464 r->headers_in.msie6 = 0; |
1468 } | 1465 } |
1469 | 1466 |
1470 if (!r->headers_in.msie && !r->headers_in.opera) { | 1467 if (!r->headers_in.msie && !r->headers_in.opera) { |
1471 | 1468 |