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.7.4.

Browse Source
This commit is contained in:
Yichun Zhang (agentzh)
2014-08-07 19:18:57 -07:00
parent b7f6be5a2f
commit e225c37731
18 changed files with 2333 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
util/mirror-tarballs
View File

@ -216,13 +216,19 @@ echo "$info_txt applying the cache_manager_exit patch for nginx $ver"
patch -p1 < $root/patches/nginx-$ver-cache_manager_exit.patch || exit 1
echo
echo "$info_txt applying the proxy_ssl_handshake_timer patch for nginx $ver"
patch -p1 < $root/patches/nginx-$ver-proxy_ssl_handshake_timer.patch || exit 1
echo
answer=`$root/util/ver-ge "$main_ver" 1.7.4`
if [ "$answer" = "N" ]; then
echo "$info_txt applying the proxy_ssl_handshake_timer patch for nginx $ver"
patch -p1 < $root/patches/nginx-$ver-proxy_ssl_handshake_timer.patch || exit 1
echo
fi
echo "$info_txt applying the geoip_init_var_fields patch for nginx $ver"
patch -p1 < $root/patches/nginx-$ver-geoip_init_var_fields.patch || exit 1
echo
answer=`$root/util/ver-ge "$main_ver" 1.7.4`
if [ "$answer" = "N" ]; then
echo "$info_txt applying the geoip_init_var_fields patch for nginx $ver"
patch -p1 < $root/patches/nginx-$ver-geoip_init_var_fields.patch || exit 1
echo
fi
answer=`$root/util/ver-ge "$main_ver" 1.4.4`
if [ "$answer" = "N" ]; then

2
util/ver
View File

@ -1,6 +1,6 @@
#!/bin/bash
main_ver=1.7.3
main_ver=1.7.4
minor_ver=1rc0
version=$main_ver.$minor_ver
echo $version