186526
/
openresty
mirror of https://github.com/openresty/openresty.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

removed the gzip_ok_invalid_read_fix patch because it is no longer needed.

This commit is contained in:
agentzh (章亦春) 2011-12-25 00:02:27 +08:00
parent 6081a9b032
commit 2b7c8182d9
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
patches/nginx-1.0.10-gzip_ok_invalid_read_fix.patch
View File

@ -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;

2
util/mirror-tarballs
View File

@ -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