Compare commits

...

3 Commits

Author SHA1 Message Date
Yichun Zhang (agentzh) a1017ea985 build-win32.sh: upgraded openssl to 1.1.1k. 2021-05-31 20:45:16 -07:00
jiahao 7bb2644fe8 bumped version to 1.19.3.2. 2021-05-28 12:33:53 +08:00
Johnny Wang e95a015346 bugfix: applied the patch for security advisory to NGINX cores >= 0.6.18 and <= 1.20.0 (CVE-2021-23017). (#739) 2021-05-28 12:30:15 +08:00
4 changed files with 36 additions and 3 deletions

View File

@ -0,0 +1,23 @@
diff --git src/core/ngx_resolver.c src/core/ngx_resolver.c
--- src/core/ngx_resolver.c
+++ src/core/ngx_resolver.c
@@ -4008,15 +4008,15 @@ done:
n = *src++;
} else {
+ if (dst != name->data) {
+ *dst++ = '.';
+ }
+
ngx_strlow(dst, src, n);
dst += n;
src += n;
n = *src++;
-
- if (n != 0) {
- *dst++ = '.';
- }
}
if (n == 0) {

View File

@ -2,8 +2,8 @@
PCRE=pcre-8.44
ZLIB=zlib-1.2.11
OPENSSL=openssl-1.1.1g
JOBS=12
OPENSSL=openssl-1.1.1k
JOBS=8
# wget https://www.openssl.org/source/openssl-1.1.1g.tar.gz
# wget http://zlib.net/zlib-1.2.11.tar.gz

View File

@ -469,6 +469,16 @@ else
echo
fi
answer=`$root/util/ver-ge "$main_ver" 0.6.18`
if [ "$answer" = "Y" ]; then
answer=`$root/util/ver-ge "$main_ver" 1.20.1`
if [ "$answer" = "N" ]; then
echo "$info_txt applying the patch for nginx security advisory (CVE-2021-23017)"
patch -p0 < $root/patches/patch.2021.resolver.txt || exit 1
echo
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

View File

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