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

Browse Source
This commit is contained in:
Yichun Zhang (agentzh)
2014-01-27 21:14:36 -08:00
parent 676150c81b
commit 227e4e0da2
19 changed files with 2223 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
util/mirror-tarballs
View File

@ -40,7 +40,7 @@ echo "$info_txt applying the server_header patch for nginx"
cp $root/patches/nginx-$main_ver-server_header.patch server_header.patch || exit 1
sed $"s/NGINX_VERSION \".unknown\"/NGINX_VERSION \".$minor_ver\"/" server_header.patch \
> server_header.patch.tmp && mv -f server_header.patch.tmp server_header.patch || exit 1
patch -p2 < server_header.patch || exit 1
patch -p1 < server_header.patch || exit 1
echo
#patch -p1 < $root/patches/nginx-$main_ver-redirect_memcpy_overlap.patch || exit 1
@ -221,9 +221,12 @@ echo "$info_txt applying the pcre_conf_opt patch for nginx $ver"
patch -p1 < $root/patches/nginx-$ver-pcre_conf_opt.patch || exit 1
echo
echo "$info_txt applying the resolve-names-with-a-trailing-dot patch for nginx $ver"
patch -p1 < $root/patches/nginx-$ver-resolve-names-with-a-trailing-dot.patch || exit 1
echo
answer=`$root/util/ver-ge "$main_ver" 1.5.9`
if [ "$answer" = "N" ]; then
echo "$info_txt applying the resolve-names-with-a-trailing-dot patch for nginx $ver"
patch -p1 < $root/patches/nginx-$ver-resolve-names-with-a-trailing-dot.patch || exit 1
echo
fi
echo "$info_txt applying the setting_args_invalidates_uri patch for nginx $ver"
patch -p1 < $root/patches/nginx-$ver-setting_args_invalidates_uri.patch || exit 1

4
util/ver
View File

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