upgraded the nginx core to 1.2.7.

This commit is contained in:
agentzh (Yichun Zhang)
2013-02-18 12:16:45 -08:00
parent 1ca5fb8597
commit db978031d2
13 changed files with 2239 additions and 5 deletions

View File

@ -132,9 +132,12 @@ 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
echo "$info_txt applying the resolver_wev_handler_segfault_with_poll patch for nginx"
patch -p1 < $root/patches/nginx-$main_ver-resolver_wev_handler_segfault_with_poll.patch || exit 1
echo
answer=`$root/util/ver-ge "$main_ver" 1.2.7`
if [ "$answer" = "N" ]; then
echo "$info_txt applying the resolver_wev_handler_segfault_with_poll patch for nginx"
patch -p1 < $root/patches/nginx-$main_ver-resolver_wev_handler_segfault_with_poll.patch || exit 1
echo
fi
rm -f *.patch || exit 1

View File

@ -1,8 +1,8 @@
#!/bin/bash
#main_ver=1.3.11
main_ver=1.2.6
minor_ver=6
main_ver=1.2.7
minor_ver=1rc1
version=$main_ver.$minor_ver
echo $version