aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2011-07-30 06:20:06 +0000
committerIgor Sysoev <igor@sysoev.ru>2011-07-30 06:20:06 +0000
commit6652cc596221b455ebe50cf77d5cc3a4116d5fa7 (patch)
treee2a873109464f5e8081aee0ec0da66c026950ba8
parentc9468026e769cc38375030cdd33d540bdc8633d5 (diff)
downloadnginx-6652cc596221b455ebe50cf77d5cc3a4116d5fa7.tar.gz
nginx-6652cc596221b455ebe50cf77d5cc3a4116d5fa7.zip
Accept-Encoding refactoring: remove ancient MSIE 4.x test for gzip
-rw-r--r--src/http/ngx_http_core_module.c10
-rw-r--r--src/http/ngx_http_request.c3
-rw-r--r--src/http/ngx_http_request.h1
3 files changed, 1 insertions, 13 deletions
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 597b64c51..02deb0ac0 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -2025,15 +2025,7 @@ ngx_http_gzip_ok(ngx_http_request_t *r)
|| r->headers_in.accept_encoding == NULL
|| ngx_strcasestrn(r->headers_in.accept_encoding->value.data,
"gzip", 4 - 1)
- == NULL
-
- /*
- * if the URL (without the "http://" prefix) is longer than 253 bytes,
- * then MSIE 4.x can not handle the compressed stream - it waits
- * too long, hangs up or crashes
- */
-
- || (r->headers_in.msie4 && r->unparsed_uri.len > 200))
+ == NULL)
{
return NGX_DECLINED;
}
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index 2cef4fa5b..167bc715a 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -1439,8 +1439,6 @@ ngx_http_process_user_agent(ngx_http_request_t *r, ngx_table_elt_t *h,
switch (msie[5]) {
case '4':
- r->headers_in.msie4 = 1;
- /* fall through */
case '5':
r->headers_in.msie6 = 1;
break;
@@ -1463,7 +1461,6 @@ ngx_http_process_user_agent(ngx_http_request_t *r, ngx_table_elt_t *h,
if (ngx_strstrn(user_agent, "Opera", 5 - 1)) {
r->headers_in.opera = 1;
r->headers_in.msie = 0;
- r->headers_in.msie4 = 0;
r->headers_in.msie6 = 0;
}
diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h
index c20810ed5..6198d7ef2 100644
--- a/src/http/ngx_http_request.h
+++ b/src/http/ngx_http_request.h
@@ -221,7 +221,6 @@ typedef struct {
unsigned connection_type:2;
unsigned msie:1;
- unsigned msie4:1;
unsigned msie6:1;
unsigned opera:1;
unsigned gecko:1;