From 0b0d528d61c66a23f123b08e84cde915723323ee Mon Sep 17 00:00:00 2001
From: Leigang Zhang <71714656+zll600@users.noreply.github.com>
Date: Wed, 21 Feb 2024 15:05:21 +0800
Subject: [PATCH] feat: upgrade to openresty-1.25.3.1 (#367)

---
 build-apisix-base.sh    | 13 +++++++------
 build-apisix-runtime.sh | 11 ++++++-----
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/build-apisix-base.sh b/build-apisix-base.sh
index be12090db..f4038bdd0 100755
--- a/build-apisix-base.sh
+++ b/build-apisix-base.sh
@@ -4,9 +4,9 @@ set -x
 
 version=${version:-0.0.0}
 
-OPENRESTY_VERSION=${OPENRESTY_VERSION:-1.21.4.2}
+OPENRESTY_VERSION=${OPENRESTY_VERSION:-1.25.3.1}
 if [ "$OPENRESTY_VERSION" == "source" ] || [ "$OPENRESTY_VERSION" == "default" ]; then
-    OPENRESTY_VERSION="1.21.4.2"
+    OPENRESTY_VERSION="1.25.3.1"
 fi
 
 if ([ $# -gt 0 ] && [ "$1" == "latest" ]) || [ "$version" == "latest" ]; then
@@ -19,10 +19,10 @@ if ([ $# -gt 0 ] && [ "$1" == "latest" ]) || [ "$version" == "latest" ]; then
     debug_args="--with-debug"
     OR_PREFIX=${OR_PREFIX:="/usr/local/openresty-debug"}
 else
-    ngx_multi_upstream_module_ver="1.1.1"
+    ngx_multi_upstream_module_ver="1.2.0"
     mod_dubbo_ver="1.0.2"
-    apisix_nginx_module_ver="1.15.0"
-    wasm_nginx_module_ver="0.6.5"
+    apisix_nginx_module_ver="1.16.0"
+    wasm_nginx_module_ver="0.7.0"
     lua_var_nginx_module_ver="v0.5.3"
     lua_resty_events_ver="0.2.0"
     debug_args=${debug_args:-}
@@ -113,7 +113,7 @@ tar -xzf LuaJIT-$lj_ver.tar.gz
 mv luajit2-* bundle/LuaJIT-2.1-20220411
 fi
 
-or_limit_ver=0.08
+or_limit_ver=0.09
 if [ ! -d "bundle/lua-resty-limit-traffic-$or_limit_ver" ]; then
     echo "ERROR: the official repository of lua-resty-limit-traffic has been updated, please sync to API7's repository." >&2
     exit 1
@@ -146,6 +146,7 @@ fi
     --with-stream_ssl_module \
     --with-stream_ssl_preread_module \
     --with-http_v2_module \
+    --with-http_v3_module \
     --without-mail_pop3_module \
     --without-mail_imap_module \
     --without-mail_smtp_module \
diff --git a/build-apisix-runtime.sh b/build-apisix-runtime.sh
index 6642a920b..8895b3d4c 100755
--- a/build-apisix-runtime.sh
+++ b/build-apisix-runtime.sh
@@ -21,11 +21,11 @@ ld_opt=${ld_opt:-"-L$zlib_prefix/lib -L$pcre_prefix/lib -L$OPENSSL_PREFIX/lib -W
 
 # dependencies for building openresty
 OPENSSL_VERSION=${OPENSSL_VERSION:-"3.2.0"}
-OPENRESTY_VERSION="1.21.4.2"
-ngx_multi_upstream_module_ver="1.1.1"
+OPENRESTY_VERSION="1.25.3.1"
+ngx_multi_upstream_module_ver="1.2.0"
 mod_dubbo_ver="1.0.2"
-apisix_nginx_module_ver="1.15.0"
-wasm_nginx_module_ver="0.6.5"
+apisix_nginx_module_ver="1.16.0"
+wasm_nginx_module_ver="0.7.0"
 lua_var_nginx_module_ver="v0.5.3"
 lua_resty_events_ver="0.2.0"
 
@@ -145,7 +145,7 @@ no_pool_patch=${no_pool_patch:-}
 
 cd openresty-${OPENRESTY_VERSION} || exit 1
 
-or_limit_ver=0.08
+or_limit_ver=0.09
 if [ ! -d "bundle/lua-resty-limit-traffic-$or_limit_ver" ]; then
     echo "ERROR: the official repository of lua-resty-limit-traffic has been updated, please sync to API7's repository." >&2
     exit 1
@@ -179,6 +179,7 @@ fi
     --with-stream_ssl_module \
     --with-stream_ssl_preread_module \
     --with-http_v2_module \
+    --with-http_v3_module \
     --without-mail_pop3_module \
     --without-mail_imap_module \
     --without-mail_smtp_module \