upgrade the nginx core to 1.21.3. (#779)

This commit is contained in:
Johnny Wang
2021-10-26 16:07:59 +08:00
committed by GitHub
parent c2bf0b421c
commit 5c7ad29352
38 changed files with 2967 additions and 183 deletions

View File

@ -452,9 +452,12 @@ rm -f *.patch || exit 1
answer=`$root/util/ver-ge "$main_ver" 1.17.8`
if [ "$answer" = "Y" ]; then
echo "$info_txt applying the patch for nginx security issue https://hackerone.com/reports/513236"
patch -p1 < $root/patches/nginx-$main_ver-static_mod_escape_loc_hdr.patch
echo
answer=`$root/util/ver-ge "$main_ver" 1.21.0`
if [ "$answer" = "N" ]; then
echo "$info_txt applying the patch for nginx security issue https://hackerone.com/reports/513236"
patch -p1 < $root/patches/nginx-$main_ver-static_mod_escape_loc_hdr.patch
echo
fi
fi
echo "$info_txt applying the always_enable_cc_feature_tests patch to nginx"

View File

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