upgraded nginx core to 1.7.0.

This commit is contained in:
Yichun Zhang (agentzh)
2014-05-03 12:59:19 -07:00
parent 2ee8fe558a
commit 9c3a123035
18 changed files with 2223 additions and 5 deletions

View File

@ -141,9 +141,12 @@ if [ "$answer" = "N" ]; then
echo
fi
echo "$info_txt applying the slab_alloc_no_memory_as_info patch for nginx"
patch -p1 < $root/patches/nginx-$main_ver-slab_alloc_no_memory_as_info.patch || exit 1
echo
answer=`$root/util/ver-ge "$main_ver" 1.5.13`
if [ "$answer" = "N" ]; then
echo "$info_txt applying the slab_alloc_no_memory_as_info patch for nginx"
patch -p1 < $root/patches/nginx-$main_ver-slab_alloc_no_memory_as_info.patch || exit 1
echo
fi
answer=`$root/util/ver-ge "$main_ver" 1.2.7`
if [ "$answer" = "N" ]; then