186526/openresty
1
0
Fork 0
mirror of https://github.com/openresty/openresty.git synced 2024-10-13 00:29:41 +00:00
Code Issues Projects Releases Wiki Activity

upgraded the nginx core to 1.2.6.

Browse Source
This commit is contained in:
agentzh (Yichun Zhang)
2012-12-23 17:54:00 -08:00
parent a841caaff8
commit f2b37bbcc7
14 changed files with 2366 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
util/mirror-tarballs
View File

@ -121,9 +121,12 @@ echo "$info_txt applying the dtrace patch for nginx"
patch -p1 < $root/patches/nginx-$main_ver-dtrace.patch || exit 1
echo
echo "$info_txt applying the upstream_test_connect_kqueue patch for nginx"
patch -p1 < $root/patches/nginx-$main_ver-upstream_test_connect_kqueue.patch || exit 1
echo
answer=`$root/util/ver-ge "$main_ver" 1.2.6`
if [ "$answer" = "N" ]; then
echo "$info_txt applying the upstream_test_connect_kqueue patch for nginx"
patch -p1 < $root/patches/nginx-$main_ver-upstream_test_connect_kqueue.patch || exit 1
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

4
util/ver
View File

@ -2,8 +2,8 @@
#main_ver=1.3.7
#main_ver=1.2.5
main_ver=1.2.4
minor_ver=14
main_ver=1.2.6
minor_ver=1rc1
version=$main_ver.$minor_ver
echo $version