upgraded the nginx core to 1.5.12.

This commit is contained in:
Yichun Zhang (agentzh)
2014-04-03 17:36:53 -07:00
parent d001d17d0c
commit b0f1e786c1
19 changed files with 2234 additions and 5 deletions

View File

@ -32,9 +32,12 @@ cd nginx-$ver || exit 1
# patch the patch
echo "$info_txt applying the patch for nginx security advisory (CVE-2014-0133)"
patch -p0 < $root/patches/patch.2014.spdy2.txt || exit 1
echo
answer=`$root/util/ver-ge "$main_ver" 1.5.12`
if [ "$answer" = "N" ]; then
echo "$info_txt applying the patch for nginx security advisory (CVE-2014-0133)"
patch -p0 < $root/patches/patch.2014.spdy2.txt || exit 1
echo
fi
echo "$info_txt applying the upstream-pipelining patch for nginx"
patch -p1 < $root/patches/nginx-$main_ver-upstream_pipelining.patch || exit 1