merged master down to nginx-1.1.x branch.

This commit is contained in:
agentzh (章亦春)
2011-10-08 02:33:01 +08:00
11 changed files with 962 additions and 94 deletions

View File

@ -38,7 +38,7 @@ patch -p1 < $root/patches/nginx-$main_ver-no_error_pages.patch || exit 1
patch -p1 < $root/patches/nginx-$main_ver-no_Werror.patch || exit 1
patch -p1 < $root/patches/nginx-$main_ver-request_body_preread_fix.patch || exit 1
#patch -p1 < $root/patches/nginx-$main_ver-request_body_preread_fix.patch || exit 1
#patch -p1 < $root/patches/nginx-$main_ver-request_body_in_single_buf.patch || exit 1
@ -46,6 +46,8 @@ patch -p1 -l < $root/patches/nginx-$main_ver-subrequest_loop.patch || exit 1
patch -p1 -l < $root/patches/nginx-$main_ver-gzip_empty_flush_buf.patch || exit 1
patch -p1 < $root/patches/nginx-$main_ver-variable_header_ignore_no_hash.patch || exit 1
rm -f *.patch || exit 1
cd .. || exit 1