From 2b7c8182d9d87cc78eafd16cb2a0cd004045d77a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?agentzh=20=28=E7=AB=A0=E4=BA=A6=E6=98=A5=29?= Date: Sun, 25 Dec 2011 00:02:27 +0800 Subject: [PATCH] removed the gzip_ok_invalid_read_fix patch because it is no longer needed. --- patches/nginx-1.0.10-gzip_ok_invalid_read_fix.patch | 11 ----------- util/mirror-tarballs | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 patches/nginx-1.0.10-gzip_ok_invalid_read_fix.patch diff --git a/patches/nginx-1.0.10-gzip_ok_invalid_read_fix.patch b/patches/nginx-1.0.10-gzip_ok_invalid_read_fix.patch deleted file mode 100644 index dc61ef8..0000000 --- a/patches/nginx-1.0.10-gzip_ok_invalid_read_fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- nginx-1.0.10/src/http/ngx_http_core_module.c 2011-11-01 21:45:33.000000000 +0800 -+++ nginx-1.0.10-patched/src/http/ngx_http_core_module.c 2011-12-22 11:08:02.546297974 +0800 -@@ -2070,7 +2070,7 @@ - * Opera: "gzip, deflate" - */ - -- if (ngx_memcmp(ae->value.data, "gzip,", 5) != 0 -+ if (ngx_memcmp(ae->value.data, "gzip,", ngx_min(ae->value.len, 5)) != 0 - && ngx_http_gzip_accept_encoding(&ae->value) != NGX_OK) - { - return NGX_DECLINED; diff --git a/util/mirror-tarballs b/util/mirror-tarballs index d51e6ea..c3a2e76 100755 --- a/util/mirror-tarballs +++ b/util/mirror-tarballs @@ -54,7 +54,7 @@ patch -p1 < $root/patches/nginx-$main_ver-allow_request_body_updating.patch || e patch -p1 < $root/patches/nginx-$main_ver-log_escape_non_ascii.patch || exit 1 -patch -p1 < $root/patches/nginx-$main_ver-gzip_ok_invalid_read_fix.patch || exit 1 +#patch -p1 < $root/patches/nginx-$main_ver-gzip_ok_invalid_read_fix.patch || exit 1 rm -f *.patch || exit 1