formal release 1.25.3.1. (#952)

Co-authored-by: jiahao <wangjiahao@openresty.com>

util/build-win32.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 
 PCRE=pcre-8.45
-ZLIB=zlib-1.2.13
+ZLIB=zlib-1.3
-OPENSSL=openssl-1.1.1t
+OPENSSL=openssl-1.1.1w
 JOBS=12
 
-# wget https://www.openssl.org/source/openssl-1.1.1p.tar.gz
+# wget https://www.openssl.org/source/openssl-1.1.1w.tar.gz
-# wget http://zlib.net/zlib-1.2.12.tar.gz
+# wget http://zlib.net/zlib-1.3.tar.gz
-# wget https://ftp.pcre.org/pub/pcre/pcre-8.44.tar.gz
+# wget https://ftp.pcre.org/pub/pcre/pcre-8.45.tar.gz
 
 rm -rf objs || exit 1
 mkdir -p objs/lib || exit 1

util/mirror-tarballs

@@ -585,7 +585,7 @@ mv openresty-rds-csv-nginx-module-* rds-csv-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.36
+ver=0.37
 $root/util/get-tarball "https://github.com/openresty/headers-more-nginx-module/tarball/v$ver" -O headers-more-nginx-module-$ver.tar.gz || exit 1
 tar -xzf headers-more-nginx-module-$ver.tar.gz || exit 1
 mv openresty-headers-more-nginx-module-* headers-more-nginx-module-$ver || exit 1
@@ -599,7 +599,7 @@ mv openresty-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.10.25
+ver=0.10.26
 $root/util/get-tarball "https://github.com/openresty/lua-nginx-module/archive/v$ver.tar.gz" -O lua-nginx-module-$ver.tar.gz || exit 1
 tar -xzf lua-nginx-module-$ver.tar.gz || exit 1
 mv lua-nginx-module-$ver ngx_lua-$ver || exit 1
@@ -613,7 +613,7 @@ mv openresty-lua-upstream-nginx-module-* ngx_lua_upstream-$ver || exit 1
 
 #################################
 
-ver=0.0.13
+ver=0.0.14
 $root/util/get-tarball "https://github.com/openresty/stream-lua-nginx-module/tarball/v$ver" -O stream-lua-nginx-module-$ver.tar.gz || exit 1
 tar -xzf stream-lua-nginx-module-$ver.tar.gz || exit 1
 mv openresty-stream-lua-nginx-module-* ngx_stream_lua-$ver || exit 1
@@ -627,7 +627,7 @@ mv openresty-array-var-nginx-module-* array-var-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.19
+ver=0.20
 $root/util/get-tarball "https://github.com/openresty/memc-nginx-module/tarball/v$ver" -O memc-nginx-module-$ver.tar.gz || exit 1
 tar -xzf memc-nginx-module-$ver.tar.gz || exit 1
 mv openresty-memc-nginx-module-* memc-nginx-module-$ver || exit 1
@@ -669,10 +669,30 @@ mv openresty-encrypted-session-nginx-module-* encrypted-session-nginx-module-$ve
 #mv ngx_http_upstream_keepalive-* upstream-keepalive-nginx-module-$ver || exit 1
 
 #################################
-ver=0.4.0.1
+
-$root/util/get-tarball "https://github.com/openresty/ngx_http_redis/tarball/v$ver" -O ngx_http_redis-$ver.tar.gz || exit 1
+ver=0.3.9
-tar -xzf ngx_http_redis-$ver.tar.gz || exit 1
+$root/util/get-tarball "https://people.freebsd.org/~osa/ngx_http_redis-$ver.tar.gz" -O redis-nginx-module-$ver.tar.gz || exit 1
-mv openresty-ngx_http_redis-* ngx_http_redis-$ver || exit 1
+tar -xzf redis-nginx-module-$ver.tar.gz || exit 1
+mv ngx_http_redis-* redis-nginx-module-$ver || exit 1
+
+cd redis-nginx-module-$ver
+echo "applying ngx_http_redis-$ver-variables_in_redis_pass.patch"
+patch -p1 < $root/patches/ngx_http_redis-$ver-variables_in_redis_pass.patch || exit 1
+
+echo
+echo "applying ngx_http_redis-$ver-default_port_fix.patch"
+patch -p1 < $root/patches/ngx_http_redis-$ver-default_port_fix.patch || exit 1
+echo
+
+answer=`$root/util/ver-ge "$main_ver" 1.23.0`
+if [ "$answer" = "Y" ]; then
+echo
+echo "applying ngx_http_redis-$ver-remove_content_encoding.patch"
+patch -p1 < $root/patches/ngx_http_redis-$ver-remove_content_encoding.patch || exit 1
+echo
+fi
+
+cd ..
 
 #################################
 
@@ -705,7 +725,7 @@ resty_cli=resty-cli-$ver
 
 #################################
 
-ver=0.0.7
+ver=0.0.8
 $root/util/get-tarball "https://github.com/openresty/opm/tarball/v$ver" -O opm-$ver.tar.gz || exit 1
 tar -xzf opm-$ver.tar.gz || exit 1
 mv openresty-opm-* opm-$ver || exit 1
@@ -777,7 +797,7 @@ mv openresty-lua-resty-redis-* lua-resty-redis-$ver || exit 1
 
 #################################
 
-ver=0.26
+ver=0.27
 $root/util/get-tarball "https://github.com/openresty/lua-resty-mysql/tarball/v$ver" -O "lua-resty-mysql-$ver.tar.gz" || exit 1
 tar -xzf lua-resty-mysql-$ver.tar.gz || exit 1
 mv openresty-lua-resty-mysql-* lua-resty-mysql-$ver || exit 1
@@ -854,7 +874,7 @@ cd ..
 
 #################################
 
-ver=0.1.27
+ver=0.1.28
 $root/util/get-tarball "https://github.com/openresty/lua-resty-core/tarball/v$ver" -O "lua-resty-core-$ver.tar.gz" || exit 1
 tar -xzf lua-resty-core-$ver.tar.gz || exit 1
 mv openresty-lua-resty-core-* lua-resty-core-$ver || exit 1