upgraded the nginx core to 1.7.2.

This commit is contained in:
Yichun Zhang (agentzh)
2014-06-17 16:57:10 -07:00
parent 6e41bcd018
commit b824a3cb59
18 changed files with 2355 additions and 8 deletions

View File

@ -238,13 +238,19 @@ if [ "$answer" = "N" ]; then
echo
fi
echo "$info_txt applying the setting_args_invalidates_uri patch for nginx $ver"
patch -p1 < $root/patches/nginx-$ver-setting_args_invalidates_uri.patch || exit 1
echo
answer=`$root/util/ver-ge "$main_ver" 1.7.1`
if [ "$answer" = "N" ]; then
echo "$info_txt applying the setting_args_invalidates_uri patch for nginx $ver"
patch -p1 < $root/patches/nginx-$ver-setting_args_invalidates_uri.patch || exit 1
echo
fi
echo "$info_txt applying the slab_defrag patch for nginx"
patch -p1 < $root/patches/nginx-$main_ver-slab_defrag.patch || exit 1
echo
answer=`$root/util/ver-ge "$main_ver" 1.7.2`
if [ "$answer" = "N" ]; then
echo "$info_txt applying the slab_defrag patch for nginx"
patch -p1 < $root/patches/nginx-$main_ver-slab_defrag.patch || exit 1
echo
fi
rm -f *.patch || exit 1