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

bugfix: backport fixes for CVE-2024-24989 and CVE-2024-24990.

Browse Source
This commit is contained in:
lijunlong
2024-05-01 10:11:04 +08:00
committed by GitHub
parent 7b7fcbe078
commit 9c9495b6f9
4 changed files with 76 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
util/mirror-tarballs
View File

@ -513,6 +513,18 @@ if [ "$answer" = "Y" ]; then
fi
fi
answer=`$root/util/ver-ge "$main_ver" 1.25.3`
if [ "$answer" = "Y" ]; then
answer=`$root/util/ver-ge "$main_ver" 1.25.4`
if [ "$answer" = "N" ]; then
echo "$info_txt applying the patch for nginx security advisory (CVE-2024-24989)"
patch -p1 < $root/patches/nginx-CVE-2024-24989.patch || exit 1
echo "$info_txt applying the patch for nginx security advisory (CVE-2024-24990)"
patch -p1 < $root/patches/nginx-CVE-2024-24990.patch || exit 1
fi
fi
echo "$info_txt applying the upstream_timeout_fields patch for nginx"
patch -p1 < $root/patches/nginx-$main_ver-upstream_timeout_fields.patch || exit 1
echo

2
util/ver
View File

@ -1,7 +1,7 @@
#!/bin/bash
main_ver=1.25.3
minor_ver=1
minor_ver=2
version=$main_ver.$minor_ver
echo $version