From 7695267e65292994aa765628b97f7d54be0aedd0 Mon Sep 17 00:00:00 2001
From: zll600 <3400692417@qq.com>
Date: Thu, 25 Jan 2024 13:49:39 +0800
Subject: [PATCH 01/19] chore: upgrade openresty-1.25.3.1

---
 build-apisix-runtime.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/build-apisix-runtime.sh b/build-apisix-runtime.sh
index 5c68fb56d..2731dda87 100755
--- a/build-apisix-runtime.sh
+++ b/build-apisix-runtime.sh
@@ -21,7 +21,7 @@ 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"
+OPENRESTY_VERSION="1.25.3.1"
 ngx_multi_upstream_module_ver="1.1.1"
 mod_dubbo_ver="1.0.2"
 apisix_nginx_module_ver="1.15.0"
@@ -91,7 +91,7 @@ fi
 if [ "$repo" == ngx_multi_upstream_module ]; then
     cp -r "$prev_workdir" ./ngx_multi_upstream_module-${ngx_multi_upstream_module_ver}
 else
-    git clone --depth=1 -b $ngx_multi_upstream_module_ver \
+    git clone --depth=1 -b \
         https://github.com/api7/ngx_multi_upstream_module.git \
         ngx_multi_upstream_module-${ngx_multi_upstream_module_ver}
 fi
@@ -107,7 +107,7 @@ fi
 if [ "$repo" == apisix-nginx-module ]; then
     cp -r "$prev_workdir" ./apisix-nginx-module-${apisix_nginx_module_ver}
 else
-    git clone --depth=1 -b $apisix_nginx_module_ver \
+    git clone --depth=1 \
         https://github.com/api7/apisix-nginx-module.git \
         apisix-nginx-module-${apisix_nginx_module_ver}
 fi
@@ -192,6 +192,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 \

From 342416ae1c47fe117eb4ff4d6f0656aff8360102 Mon Sep 17 00:00:00 2001
From: zll600 <3400692417@qq.com>
Date: Mon, 29 Jan 2024 09:39:36 +0800
Subject: [PATCH 02/19] chore: use ci to test apisix-nginx-module

---
 build-apisix-runtime.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-apisix-runtime.sh b/build-apisix-runtime.sh
index 2731dda87..89cb6f0de 100755
--- a/build-apisix-runtime.sh
+++ b/build-apisix-runtime.sh
@@ -107,8 +107,8 @@ fi
 if [ "$repo" == apisix-nginx-module ]; then
     cp -r "$prev_workdir" ./apisix-nginx-module-${apisix_nginx_module_ver}
 else
-    git clone --depth=1 \
-        https://github.com/api7/apisix-nginx-module.git \
+    git clone --depth=1 -b upgrade_openresty_1.25.3.1 \
+        https://github.com/zll600/apisix-nginx-module.git \
         apisix-nginx-module-${apisix_nginx_module_ver}
 fi
 

From 7221c098682a6684c5412510a351b800c6ea8eda Mon Sep 17 00:00:00 2001
From: zll600 <3400692417@qq.com>
Date: Mon, 29 Jan 2024 09:41:27 +0800
Subject: [PATCH 03/19] fix: update git clone cmd

---
 build-apisix-runtime.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-apisix-runtime.sh b/build-apisix-runtime.sh
index 89cb6f0de..660ecc6fb 100755
--- a/build-apisix-runtime.sh
+++ b/build-apisix-runtime.sh
@@ -91,7 +91,7 @@ fi
 if [ "$repo" == ngx_multi_upstream_module ]; then
     cp -r "$prev_workdir" ./ngx_multi_upstream_module-${ngx_multi_upstream_module_ver}
 else
-    git clone --depth=1 -b \
+    git clone --depth=1 \
         https://github.com/api7/ngx_multi_upstream_module.git \
         ngx_multi_upstream_module-${ngx_multi_upstream_module_ver}
 fi

From 26572c49dfe4fe2314d209bcc489c9e858d74c2f Mon Sep 17 00:00:00 2001
From: zll600 <3400692417@qq.com>
Date: Mon, 29 Jan 2024 13:28:22 +0800
Subject: [PATCH 04/19] fix: upgrade lua-resty-limit-traffic version to 0.09

---
 build-apisix-runtime.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-apisix-runtime.sh b/build-apisix-runtime.sh
index 660ecc6fb..52a7fb0c1 100755
--- a/build-apisix-runtime.sh
+++ b/build-apisix-runtime.sh
@@ -157,7 +157,7 @@ grpc_engine_path="-DNGX_GRPC_CLI_ENGINE_PATH=$OR_PREFIX/libgrpc_engine.so -DNGX_
 
 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

From 521ec22883d6f49f0b494a15c8d8bd7792a479d1 Mon Sep 17 00:00:00 2001
From: zll600 <3400692417@qq.com>
Date: Mon, 29 Jan 2024 14:34:12 +0800
Subject: [PATCH 05/19] fix: update build-apisix-base.sh

---
 build-apisix-base.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/build-apisix-base.sh b/build-apisix-base.sh
index eb9243456..1f9355333 100755
--- a/build-apisix-base.sh
+++ b/build-apisix-base.sh
@@ -4,15 +4,15 @@ 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
     ngx_multi_upstream_module_ver="master"
     mod_dubbo_ver="master"
-    apisix_nginx_module_ver="main"
+    apisix_nginx_module_ver="upgrade_openresty-1.25.3.1"
     wasm_nginx_module_ver="main"
     lua_var_nginx_module_ver="master"
     grpc_client_nginx_module_ver="main"
@@ -59,7 +59,7 @@ if [ "$repo" == apisix-nginx-module ]; then
     cp -r "$prev_workdir" ./apisix-nginx-module-${apisix_nginx_module_ver}
 else
     git clone --depth=1 -b $apisix_nginx_module_ver \
-        https://github.com/api7/apisix-nginx-module.git \
+        https://github.com/zll600/apisix-nginx-module.git \
         apisix-nginx-module-${apisix_nginx_module_ver}
 fi
 
@@ -126,7 +126,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
@@ -160,6 +160,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 \

From 759e4def1b1d1c5f132be3d0d4fe5c6f7db0deb8 Mon Sep 17 00:00:00 2001
From: zll600 <3400692417@qq.com>
Date: Mon, 29 Jan 2024 14:47:38 +0800
Subject: [PATCH 06/19] fix: update or_limit_ver

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

diff --git a/build-apisix-base.sh b/build-apisix-base.sh
index 1f9355333..ba3237dd2 100755
--- a/build-apisix-base.sh
+++ b/build-apisix-base.sh
@@ -126,7 +126,12 @@ tar -xzf LuaJIT-$lj_ver.tar.gz
 mv luajit2-* bundle/LuaJIT-2.1-20220411
 fi
 
-or_limit_ver=0.09
+or_limit_ver=0.08
+
+if [ OPENRESTY_VERSION == "1.25.3.1" ]; then
+    or_limit_ver = 0.09
+fi
+
 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
diff --git a/build-apisix-runtime.sh b/build-apisix-runtime.sh
index 52a7fb0c1..92a2b3972 100755
--- a/build-apisix-runtime.sh
+++ b/build-apisix-runtime.sh
@@ -157,7 +157,11 @@ grpc_engine_path="-DNGX_GRPC_CLI_ENGINE_PATH=$OR_PREFIX/libgrpc_engine.so -DNGX_
 
 cd openresty-${OPENRESTY_VERSION} || exit 1
 
-or_limit_ver=0.09
+or_limit_ver=0.08
+if [ OPENRESTY_VERSION == "1.25.3.1" ]; then
+    or_limit_ver = 0.09
+fi
+
 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

From d0468af5157d88f0491ddbca4dcc6f54a7a1570c Mon Sep 17 00:00:00 2001
From: zll600 <3400692417@qq.com>
Date: Mon, 29 Jan 2024 14:50:19 +0800
Subject: [PATCH 07/19] fix: update or_limit_ver

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

diff --git a/build-apisix-base.sh b/build-apisix-base.sh
index ba3237dd2..f389145df 100755
--- a/build-apisix-base.sh
+++ b/build-apisix-base.sh
@@ -128,7 +128,7 @@ fi
 
 or_limit_ver=0.08
 
-if [ OPENRESTY_VERSION == "1.25.3.1" ]; then
+if [ "$OPENRESTY_VERSION" == "1.25.3.1" ]; then
     or_limit_ver = 0.09
 fi
 
diff --git a/build-apisix-runtime.sh b/build-apisix-runtime.sh
index 92a2b3972..63566e549 100755
--- a/build-apisix-runtime.sh
+++ b/build-apisix-runtime.sh
@@ -158,7 +158,7 @@ grpc_engine_path="-DNGX_GRPC_CLI_ENGINE_PATH=$OR_PREFIX/libgrpc_engine.so -DNGX_
 cd openresty-${OPENRESTY_VERSION} || exit 1
 
 or_limit_ver=0.08
-if [ OPENRESTY_VERSION == "1.25.3.1" ]; then
+if [ "$OPENRESTY_VERSION" == "1.25.3.1" ]; then
     or_limit_ver = 0.09
 fi
 

From 6da9fd18f65846d8a51666f33b61eb44e418d8ff Mon Sep 17 00:00:00 2001
From: zll600 <3400692417@qq.com>
Date: Mon, 29 Jan 2024 14:57:48 +0800
Subject: [PATCH 08/19] fix: add enable_http3 variable

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

diff --git a/build-apisix-base.sh b/build-apisix-base.sh
index f389145df..ebfe24c4a 100755
--- a/build-apisix-base.sh
+++ b/build-apisix-base.sh
@@ -114,7 +114,7 @@ no_pool_patch=${no_pool_patch:-}
 # TODO: remove old NGX_HTTP_GRPC_CLI_ENGINE_PATH once we have released a new
 # version of grpc-client-nginx-module
 grpc_engine_path="-DNGX_GRPC_CLI_ENGINE_PATH=$OR_PREFIX/libgrpc_engine.so -DNGX_HTTP_GRPC_CLI_ENGINE_PATH=$OR_PREFIX/libgrpc_engine.so"
-
+or_limit_ver
 cd openresty-${OPENRESTY_VERSION} || exit 1
 
 if [[ "$OPENRESTY_VERSION" == 1.21.4.1 ]] || [[ "$OPENRESTY_VERSION" == 1.19.* ]]; then
@@ -127,9 +127,10 @@ mv luajit2-* bundle/LuaJIT-2.1-20220411
 fi
 
 or_limit_ver=0.08
-
+enable_http3=${enable_http3:-}
 if [ "$OPENRESTY_VERSION" == "1.25.3.1" ]; then
-    or_limit_ver = 0.09
+    or_limit_ver=0.09or_limit_ver
+    enable_http3="--with-http_v3_module"
 fi
 
 if [ ! -d "bundle/lua-resty-limit-traffic-$or_limit_ver" ]; then
@@ -165,7 +166,7 @@ fi
     --with-stream_ssl_module \
     --with-stream_ssl_preread_module \
     --with-http_v2_module \
-    --with-http_v3_module \
+    $enable_http3 \
     --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 63566e549..f7faf688a 100755
--- a/build-apisix-runtime.sh
+++ b/build-apisix-runtime.sh
@@ -158,8 +158,10 @@ grpc_engine_path="-DNGX_GRPC_CLI_ENGINE_PATH=$OR_PREFIX/libgrpc_engine.so -DNGX_
 cd openresty-${OPENRESTY_VERSION} || exit 1
 
 or_limit_ver=0.08
+enable_http3=${enable_http3:-}
 if [ "$OPENRESTY_VERSION" == "1.25.3.1" ]; then
-    or_limit_ver = 0.09
+    or_limit_ver=0.09
+    enable_http3="--with-http_v3_module"
 fi
 
 if [ ! -d "bundle/lua-resty-limit-traffic-$or_limit_ver" ]; then
@@ -196,7 +198,7 @@ fi
     --with-stream_ssl_module \
     --with-stream_ssl_preread_module \
     --with-http_v2_module \
-    --with-http_v3_module \
+    $enable_http3 \
     --without-mail_pop3_module \
     --without-mail_imap_module \
     --without-mail_smtp_module \

From d8a11df607e45c8f63678f883c09c69224810c72 Mon Sep 17 00:00:00 2001
From: zll600 <3400692417@qq.com>
Date: Mon, 29 Jan 2024 15:01:20 +0800
Subject: [PATCH 09/19] fix: remove unused variable

---
 build-apisix-base.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build-apisix-base.sh b/build-apisix-base.sh
index ebfe24c4a..e6189cdda 100755
--- a/build-apisix-base.sh
+++ b/build-apisix-base.sh
@@ -114,7 +114,6 @@ no_pool_patch=${no_pool_patch:-}
 # TODO: remove old NGX_HTTP_GRPC_CLI_ENGINE_PATH once we have released a new
 # version of grpc-client-nginx-module
 grpc_engine_path="-DNGX_GRPC_CLI_ENGINE_PATH=$OR_PREFIX/libgrpc_engine.so -DNGX_HTTP_GRPC_CLI_ENGINE_PATH=$OR_PREFIX/libgrpc_engine.so"
-or_limit_ver
 cd openresty-${OPENRESTY_VERSION} || exit 1
 
 if [[ "$OPENRESTY_VERSION" == 1.21.4.1 ]] || [[ "$OPENRESTY_VERSION" == 1.19.* ]]; then

From 1e3778063e030ab7ddd163def5ddb7c10155a791 Mon Sep 17 00:00:00 2001
From: zll600 <3400692417@qq.com>
Date: Mon, 29 Jan 2024 15:07:30 +0800
Subject: [PATCH 10/19] fix: or_limit_ver

---
 build-apisix-base.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-apisix-base.sh b/build-apisix-base.sh
index e6189cdda..36348b470 100755
--- a/build-apisix-base.sh
+++ b/build-apisix-base.sh
@@ -128,7 +128,7 @@ fi
 or_limit_ver=0.08
 enable_http3=${enable_http3:-}
 if [ "$OPENRESTY_VERSION" == "1.25.3.1" ]; then
-    or_limit_ver=0.09or_limit_ver
+    or_limit_ver=0.09
     enable_http3="--with-http_v3_module"
 fi
 

From fed95b6463ed5574b46841cec66fee28e45d438e Mon Sep 17 00:00:00 2001
From: zll600 <3400692417@qq.com>
Date: Mon, 29 Jan 2024 17:00:36 +0800
Subject: [PATCH 11/19] fix: update ngx_multi_upstream_module

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

diff --git a/build-apisix-base.sh b/build-apisix-base.sh
index 36348b470..b0cb65b8f 100755
--- a/build-apisix-base.sh
+++ b/build-apisix-base.sh
@@ -42,7 +42,7 @@ tar -zxvpf openresty-${OPENRESTY_VERSION}.tar.gz > /dev/null
 if [ "$repo" == ngx_multi_upstream_module ]; then
     cp -r "$prev_workdir" ./ngx_multi_upstream_module-${ngx_multi_upstream_module_ver}
 else
-    git clone --depth=1 -b $ngx_multi_upstream_module_ver \
+    git clone --depth=1 -b upgrade_openresty-1.25.3 \
         https://github.com/api7/ngx_multi_upstream_module.git \
         ngx_multi_upstream_module-${ngx_multi_upstream_module_ver}
 fi
diff --git a/build-apisix-runtime.sh b/build-apisix-runtime.sh
index f7faf688a..8d64cf52f 100755
--- a/build-apisix-runtime.sh
+++ b/build-apisix-runtime.sh
@@ -91,7 +91,7 @@ fi
 if [ "$repo" == ngx_multi_upstream_module ]; then
     cp -r "$prev_workdir" ./ngx_multi_upstream_module-${ngx_multi_upstream_module_ver}
 else
-    git clone --depth=1 \
+    git clone --depth=1 -b upgrade_openresty-1.25.3 \
         https://github.com/api7/ngx_multi_upstream_module.git \
         ngx_multi_upstream_module-${ngx_multi_upstream_module_ver}
 fi

From 0a1a3637c11cede4628acf51bef7d9b2803e8758 Mon Sep 17 00:00:00 2001
From: zll600 <3400692417@qq.com>
Date: Mon, 29 Jan 2024 17:01:32 +0800
Subject: [PATCH 12/19] fix: use zll600 repo

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

diff --git a/build-apisix-base.sh b/build-apisix-base.sh
index b0cb65b8f..d0a4ce67e 100755
--- a/build-apisix-base.sh
+++ b/build-apisix-base.sh
@@ -43,7 +43,7 @@ if [ "$repo" == ngx_multi_upstream_module ]; then
     cp -r "$prev_workdir" ./ngx_multi_upstream_module-${ngx_multi_upstream_module_ver}
 else
     git clone --depth=1 -b upgrade_openresty-1.25.3 \
-        https://github.com/api7/ngx_multi_upstream_module.git \
+        https://github.com/zll600/ngx_multi_upstream_module.git \
         ngx_multi_upstream_module-${ngx_multi_upstream_module_ver}
 fi
 
diff --git a/build-apisix-runtime.sh b/build-apisix-runtime.sh
index 8d64cf52f..3634acf97 100755
--- a/build-apisix-runtime.sh
+++ b/build-apisix-runtime.sh
@@ -92,7 +92,7 @@ if [ "$repo" == ngx_multi_upstream_module ]; then
     cp -r "$prev_workdir" ./ngx_multi_upstream_module-${ngx_multi_upstream_module_ver}
 else
     git clone --depth=1 -b upgrade_openresty-1.25.3 \
-        https://github.com/api7/ngx_multi_upstream_module.git \
+        https://github.com/zll600/ngx_multi_upstream_module.git \
         ngx_multi_upstream_module-${ngx_multi_upstream_module_ver}
 fi
 

From 59795e3a42e80a2d9710c92dfa2e1fa3d5335c86 Mon Sep 17 00:00:00 2001
From: zll600 <3400692417@qq.com>
Date: Mon, 29 Jan 2024 17:02:22 +0800
Subject: [PATCH 13/19] fix: use zll600 branch

---
 build-apisix-base.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-apisix-base.sh b/build-apisix-base.sh
index d0a4ce67e..90361f6bf 100755
--- a/build-apisix-base.sh
+++ b/build-apisix-base.sh
@@ -58,7 +58,7 @@ fi
 if [ "$repo" == apisix-nginx-module ]; then
     cp -r "$prev_workdir" ./apisix-nginx-module-${apisix_nginx_module_ver}
 else
-    git clone --depth=1 -b $apisix_nginx_module_ver \
+    git clone --depth=1 -b upgrade_openresty_1.25.3.1 \
         https://github.com/zll600/apisix-nginx-module.git \
         apisix-nginx-module-${apisix_nginx_module_ver}
 fi

From 8c15cc9634749a85a3c76fda9f871b41ba2ea555 Mon Sep 17 00:00:00 2001
From: zll600 <3400692417@qq.com>
Date: Mon, 29 Jan 2024 22:43:28 +0800
Subject: [PATCH 14/19] chore: use zll600 grpc-client-nginx-module

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

diff --git a/build-apisix-base.sh b/build-apisix-base.sh
index 90361f6bf..f01d78df4 100755
--- a/build-apisix-base.sh
+++ b/build-apisix-base.sh
@@ -82,7 +82,7 @@ fi
 if [ "$repo" == grpc-client-nginx-module ]; then
     cp -r "$prev_workdir" ./grpc-client-nginx-module-${grpc_client_nginx_module_ver}
 else
-    git clone --depth=1 -b $grpc_client_nginx_module_ver \
+    git clone --depth=1 -b fix_header_files \
         https://github.com/api7/grpc-client-nginx-module \
         grpc-client-nginx-module-${grpc_client_nginx_module_ver}
 fi
diff --git a/build-apisix-runtime.sh b/build-apisix-runtime.sh
index 3634acf97..fd5a24c60 100755
--- a/build-apisix-runtime.sh
+++ b/build-apisix-runtime.sh
@@ -131,7 +131,7 @@ fi
 if [ "$repo" == grpc-client-nginx-module ]; then
     cp -r "$prev_workdir" ./grpc-client-nginx-module-${grpc_client_nginx_module_ver}
 else
-    git clone --depth=1 -b $grpc_client_nginx_module_ver \
+    git clone --depth=1 -b fix_header_files \
         https://github.com/api7/grpc-client-nginx-module \
         grpc-client-nginx-module-${grpc_client_nginx_module_ver}
 fi

From f7a9a5b4c79c24051c6907f352e0600e7c428eed Mon Sep 17 00:00:00 2001
From: zll600 <3400692417@qq.com>
Date: Mon, 29 Jan 2024 22:46:53 +0800
Subject: [PATCH 15/19] chore: use zll600 grpc-client-nginx-module

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

diff --git a/build-apisix-base.sh b/build-apisix-base.sh
index f01d78df4..e15ca2a27 100755
--- a/build-apisix-base.sh
+++ b/build-apisix-base.sh
@@ -83,7 +83,7 @@ if [ "$repo" == grpc-client-nginx-module ]; then
     cp -r "$prev_workdir" ./grpc-client-nginx-module-${grpc_client_nginx_module_ver}
 else
     git clone --depth=1 -b fix_header_files \
-        https://github.com/api7/grpc-client-nginx-module \
+        https://github.com/zll600/grpc-client-nginx-module \
         grpc-client-nginx-module-${grpc_client_nginx_module_ver}
 fi
 
diff --git a/build-apisix-runtime.sh b/build-apisix-runtime.sh
index fd5a24c60..8ca854e11 100755
--- a/build-apisix-runtime.sh
+++ b/build-apisix-runtime.sh
@@ -132,7 +132,7 @@ if [ "$repo" == grpc-client-nginx-module ]; then
     cp -r "$prev_workdir" ./grpc-client-nginx-module-${grpc_client_nginx_module_ver}
 else
     git clone --depth=1 -b fix_header_files \
-        https://github.com/api7/grpc-client-nginx-module \
+        https://github.com/zll600/grpc-client-nginx-module \
         grpc-client-nginx-module-${grpc_client_nginx_module_ver}
 fi
 

From d1843954975e9b6918450bf4ba52fa837efc8e23 Mon Sep 17 00:00:00 2001
From: zll600 <3400692417@qq.com>
Date: Mon, 29 Jan 2024 23:07:30 +0800
Subject: [PATCH 16/19] chore: use zll600 wasm-nginx-module

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

diff --git a/build-apisix-base.sh b/build-apisix-base.sh
index e15ca2a27..b694244c5 100755
--- a/build-apisix-base.sh
+++ b/build-apisix-base.sh
@@ -66,8 +66,8 @@ fi
 if [ "$repo" == wasm-nginx-module ]; then
     cp -r "$prev_workdir" ./wasm-nginx-module-${wasm_nginx_module_ver}
 else
-    git clone --depth=1 -b $wasm_nginx_module_ver \
-        https://github.com/api7/wasm-nginx-module.git \
+    git clone --depth=1 -b fix_header_files \
+        https://github.com/zll600/wasm-nginx-module.git \
         wasm-nginx-module-${wasm_nginx_module_ver}
 fi
 
diff --git a/build-apisix-runtime.sh b/build-apisix-runtime.sh
index 8ca854e11..56d61d6a5 100755
--- a/build-apisix-runtime.sh
+++ b/build-apisix-runtime.sh
@@ -115,8 +115,8 @@ fi
 if [ "$repo" == wasm-nginx-module ]; then
     cp -r "$prev_workdir" ./wasm-nginx-module-${wasm_nginx_module_ver}
 else
-    git clone --depth=1 -b $wasm_nginx_module_ver \
-        https://github.com/api7/wasm-nginx-module.git \
+    git clone --depth=1 -b fix_header_files \
+        https://github.com/zll600/wasm-nginx-module.git \
         wasm-nginx-module-${wasm_nginx_module_ver}
 fi
 

From 5f07effaca6b4ae227cb578a120c89637952e415 Mon Sep 17 00:00:00 2001
From: zll600 <3400692417@qq.com>
Date: Wed, 21 Feb 2024 11:06:50 +0800
Subject: [PATCH 17/19] chore: revert git tag of modules

---
 build-apisix-base.sh    | 26 +++++++++++++-------------
 build-apisix-runtime.sh | 24 ++++++++++++------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/build-apisix-base.sh b/build-apisix-base.sh
index b694244c5..1fe2fe3a9 100755
--- a/build-apisix-base.sh
+++ b/build-apisix-base.sh
@@ -12,7 +12,7 @@ fi
 if ([ $# -gt 0 ] && [ "$1" == "latest" ]) || [ "$version" == "latest" ]; then
     ngx_multi_upstream_module_ver="master"
     mod_dubbo_ver="master"
-    apisix_nginx_module_ver="upgrade_openresty-1.25.3.1"
+    apisix_nginx_module_ver="main"
     wasm_nginx_module_ver="main"
     lua_var_nginx_module_ver="master"
     grpc_client_nginx_module_ver="main"
@@ -20,12 +20,12 @@ 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"
-    grpc_client_nginx_module_ver="v0.4.4"
+    grpc_client_nginx_module_ver="v0.5.0"
     lua_resty_events_ver="0.2.0"
     debug_args=${debug_args:-}
     OR_PREFIX=${OR_PREFIX:="/usr/local/openresty"}
@@ -42,8 +42,8 @@ tar -zxvpf openresty-${OPENRESTY_VERSION}.tar.gz > /dev/null
 if [ "$repo" == ngx_multi_upstream_module ]; then
     cp -r "$prev_workdir" ./ngx_multi_upstream_module-${ngx_multi_upstream_module_ver}
 else
-    git clone --depth=1 -b upgrade_openresty-1.25.3 \
-        https://github.com/zll600/ngx_multi_upstream_module.git \
+    git clone --depth=1 -b $ngx_multi_upstream_module_ver \
+        https://github.com/api7/ngx_multi_upstream_module.git \
         ngx_multi_upstream_module-${ngx_multi_upstream_module_ver}
 fi
 
@@ -58,16 +58,16 @@ fi
 if [ "$repo" == apisix-nginx-module ]; then
     cp -r "$prev_workdir" ./apisix-nginx-module-${apisix_nginx_module_ver}
 else
-    git clone --depth=1 -b upgrade_openresty_1.25.3.1 \
-        https://github.com/zll600/apisix-nginx-module.git \
+    git clone --depth=1 -b $apisix_nginx_module_ver \
+        https://github.com/api7/apisix-nginx-module.git \
         apisix-nginx-module-${apisix_nginx_module_ver}
 fi
 
 if [ "$repo" == wasm-nginx-module ]; then
     cp -r "$prev_workdir" ./wasm-nginx-module-${wasm_nginx_module_ver}
 else
-    git clone --depth=1 -b fix_header_files \
-        https://github.com/zll600/wasm-nginx-module.git \
+    git clone --depth=1 -b $wasm_nginx_module_ver \
+        https://github.com/api7/wasm-nginx-module.git \
         wasm-nginx-module-${wasm_nginx_module_ver}
 fi
 
@@ -82,8 +82,8 @@ fi
 if [ "$repo" == grpc-client-nginx-module ]; then
     cp -r "$prev_workdir" ./grpc-client-nginx-module-${grpc_client_nginx_module_ver}
 else
-    git clone --depth=1 -b fix_header_files \
-        https://github.com/zll600/grpc-client-nginx-module \
+    git clone --depth=1 -b $grpc_client_nginx_module_ver \
+        https://github.com/api7/grpc-client-nginx-module \
         grpc-client-nginx-module-${grpc_client_nginx_module_ver}
 fi
 
diff --git a/build-apisix-runtime.sh b/build-apisix-runtime.sh
index 56d61d6a5..3b7240f2c 100755
--- a/build-apisix-runtime.sh
+++ b/build-apisix-runtime.sh
@@ -22,12 +22,12 @@ 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.25.3.1"
-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"
-grpc_client_nginx_module_ver="v0.4.4"
+grpc_client_nginx_module_ver="v0.5.0"
 lua_resty_events_ver="0.2.0"
 
 
@@ -91,8 +91,8 @@ fi
 if [ "$repo" == ngx_multi_upstream_module ]; then
     cp -r "$prev_workdir" ./ngx_multi_upstream_module-${ngx_multi_upstream_module_ver}
 else
-    git clone --depth=1 -b upgrade_openresty-1.25.3 \
-        https://github.com/zll600/ngx_multi_upstream_module.git \
+    git clone --depth=1 -b $ngx_multi_upstream_module_ver \
+        https://github.com/api7/ngx_multi_upstream_module.git \
         ngx_multi_upstream_module-${ngx_multi_upstream_module_ver}
 fi
 
@@ -107,16 +107,16 @@ fi
 if [ "$repo" == apisix-nginx-module ]; then
     cp -r "$prev_workdir" ./apisix-nginx-module-${apisix_nginx_module_ver}
 else
-    git clone --depth=1 -b upgrade_openresty_1.25.3.1 \
-        https://github.com/zll600/apisix-nginx-module.git \
+    git clone --depth=1 -b $apisix_nginx_module_ver \
+        https://github.com/api7/apisix-nginx-module.git \
         apisix-nginx-module-${apisix_nginx_module_ver}
 fi
 
 if [ "$repo" == wasm-nginx-module ]; then
     cp -r "$prev_workdir" ./wasm-nginx-module-${wasm_nginx_module_ver}
 else
-    git clone --depth=1 -b fix_header_files \
-        https://github.com/zll600/wasm-nginx-module.git \
+    git clone --depth=1 -b $wasm_nginx_module_ver \
+        https://github.com/api7/wasm-nginx-module.git \
         wasm-nginx-module-${wasm_nginx_module_ver}
 fi
 
@@ -131,8 +131,8 @@ fi
 if [ "$repo" == grpc-client-nginx-module ]; then
     cp -r "$prev_workdir" ./grpc-client-nginx-module-${grpc_client_nginx_module_ver}
 else
-    git clone --depth=1 -b fix_header_files \
-        https://github.com/zll600/grpc-client-nginx-module \
+    git clone --depth=1 -b $grpc_client_nginx_module_ver \
+        https://github.com/api7/grpc-client-nginx-module \
         grpc-client-nginx-module-${grpc_client_nginx_module_ver}
 fi
 

From 53f2d147473fb6d2a3ee1d70c3822f9b814020e4 Mon Sep 17 00:00:00 2001
From: zll600 <3400692417@qq.com>
Date: Wed, 21 Feb 2024 14:17:05 +0800
Subject: [PATCH 18/19] chore: enable http3 default

---
 build-apisix-base.sh    | 9 ++-------
 build-apisix-runtime.sh | 9 ++-------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/build-apisix-base.sh b/build-apisix-base.sh
index 530b655e6..af13dc48d 100755
--- a/build-apisix-base.sh
+++ b/build-apisix-base.sh
@@ -113,12 +113,7 @@ tar -xzf LuaJIT-$lj_ver.tar.gz
 mv luajit2-* bundle/LuaJIT-2.1-20220411
 fi
 
-or_limit_ver=0.08
-enable_http3=${enable_http3:-}
-if [ "$OPENRESTY_VERSION" == "1.25.3.1" ]; then
-    or_limit_ver=0.09
-    enable_http3="--with-http_v3_module"
-fi
+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
@@ -152,7 +147,7 @@ fi
     --with-stream_ssl_module \
     --with-stream_ssl_preread_module \
     --with-http_v2_module \
-    $enable_http3 \
+    --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 f66035b39..838dd4015 100755
--- a/build-apisix-runtime.sh
+++ b/build-apisix-runtime.sh
@@ -145,12 +145,7 @@ no_pool_patch=${no_pool_patch:-}
 
 cd openresty-${OPENRESTY_VERSION} || exit 1
 
-or_limit_ver=0.08
-enable_http3=${enable_http3:-}
-if [ "$OPENRESTY_VERSION" == "1.25.3.1" ]; then
-    or_limit_ver=0.09
-    enable_http3="--with-http_v3_module"
-fi
+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
@@ -185,7 +180,7 @@ fi
     --with-stream_ssl_module \
     --with-stream_ssl_preread_module \
     --with-http_v2_module \
-    $enable_http3 \
+    --with-http_v3_module \
     --without-mail_pop3_module \
     --without-mail_imap_module \
     --without-mail_smtp_module \

From b71cccf08ef3819d4d6ba707bf4f1e982fe96713 Mon Sep 17 00:00:00 2001
From: zll600 <3400692417@qq.com>
Date: Wed, 21 Feb 2024 14:19:02 +0800
Subject: [PATCH 19/19] style: remove extra lines

---
 build-apisix-base.sh    | 1 -
 build-apisix-runtime.sh | 1 -
 2 files changed, 2 deletions(-)

diff --git a/build-apisix-base.sh b/build-apisix-base.sh
index af13dc48d..f4038bdd0 100755
--- a/build-apisix-base.sh
+++ b/build-apisix-base.sh
@@ -114,7 +114,6 @@ mv luajit2-* bundle/LuaJIT-2.1-20220411
 fi
 
 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
diff --git a/build-apisix-runtime.sh b/build-apisix-runtime.sh
index 838dd4015..8895b3d4c 100755
--- a/build-apisix-runtime.sh
+++ b/build-apisix-runtime.sh
@@ -146,7 +146,6 @@ no_pool_patch=${no_pool_patch:-}
 cd openresty-${OPENRESTY_VERSION} || exit 1
 
 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