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 nginx core to 1.7.0.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

9
util/mirror-tarballs
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

4
util/ver
View File

@ -1,7 +1,7 @@
#!/bin/bash
main_ver=1.5.12
minor_ver=1
main_ver=1.7.0
minor_ver=1rc1
version=$main_ver.$minor_ver
echo $version