You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by sh...@apache.org on 2025/02/10 02:54:44 UTC

(apisix) branch master updated: chore: upgrade openresty version to v1.27.11 (#11936)

This is an automated email from the ASF dual-hosted git repository.

shreemaanabhishek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git


The following commit(s) were added to refs/heads/master by this push:
     new 346722f81 chore: upgrade openresty version to v1.27.11 (#11936)
346722f81 is described below

commit 346722f815efb0453aa9858067dfd858d96fab43
Author: Shreemaan Abhishek <sh...@gmail.com>
AuthorDate: Mon Feb 10 08:39:38 2025 +0545

    chore: upgrade openresty version to v1.27.11 (#11936)
---
 .requirements                       | 2 +-
 apisix/ssl/router/radixtree_sni.lua | 3 ++-
 t/node/grpc-proxy.t                 | 4 ++--
 t/plugin/proxy-mirror3.t            | 2 +-
 t/plugin/uri-blocker.t              | 4 ++--
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.requirements b/.requirements
index 6c393209f..36232df7e 100644
--- a/.requirements
+++ b/.requirements
@@ -17,4 +17,4 @@
 
 APISIX_PACKAGE_NAME=apisix
 
-APISIX_RUNTIME=1.2.1
+APISIX_RUNTIME=1.3.0
diff --git a/apisix/ssl/router/radixtree_sni.lua b/apisix/ssl/router/radixtree_sni.lua
index caa69194e..ae7e5b265 100644
--- a/apisix/ssl/router/radixtree_sni.lua
+++ b/apisix/ssl/router/radixtree_sni.lua
@@ -258,7 +258,8 @@ function _M.set(matched_ssl, sni)
             local reject_in_handshake =
                 (ngx.config.subsystem == "stream") or
                 (matched_ssl.value.client.skip_mtls_uri_regex == nil)
-            local ok, err = ngx_ssl.verify_client(parsed_cert, depth,
+            -- TODO: support passing `trusted_certs` (3rd arg, keep it nil for now)
+            local ok, err = ngx_ssl.verify_client(parsed_cert, depth, nil,
                 reject_in_handshake)
             if not ok then
                 return false, err
diff --git a/t/node/grpc-proxy.t b/t/node/grpc-proxy.t
index c4f0dd036..ba25c66dd 100644
--- a/t/node/grpc-proxy.t
+++ b/t/node/grpc-proxy.t
@@ -169,7 +169,7 @@ routes:
 GET /hello
 --- error_code: 502
 --- error_log
-upstream: "grpcs://127.0.0.1:443"
+connect() failed (111: Connection refused) while connecting to upstream
 
 
 
@@ -188,7 +188,7 @@ routes:
 GET /hello
 --- error_code: 502
 --- error_log
-upstream: "grpc://127.0.0.1:80"
+connect() failed (111: Connection refused) while connecting to upstream
 
 
 
diff --git a/t/plugin/proxy-mirror3.t b/t/plugin/proxy-mirror3.t
index 967ef0c11..2fdc90d3b 100644
--- a/t/plugin/proxy-mirror3.t
+++ b/t/plugin/proxy-mirror3.t
@@ -73,4 +73,4 @@ grpcurl -import-path ./t/grpc_server_example/proto -proto helloworld.proto -plai
   "message": "Hello apisix"
 }
 --- error_log eval
-qr/Connection refused\) while connecting to upstream.*proxy_mirror_grpc/
+qr/Connection refused\) while connecting to upstream/
diff --git a/t/plugin/uri-blocker.t b/t/plugin/uri-blocker.t
index 616f3e842..0187fe31c 100644
--- a/t/plugin/uri-blocker.t
+++ b/t/plugin/uri-blocker.t
@@ -51,7 +51,7 @@ location /t {
 GET /t
 --- error_code: 400
 --- response_body
-{"error_msg":"failed to check the configuration of plugin uri-blocker err: pcre_compile() failed: missing ) in \".+(\""}
+{"error_msg":"failed to check the configuration of plugin uri-blocker err: pcre2_compile() failed: missing closing parenthesis in \".+(\""}
 
 
 
@@ -112,7 +112,7 @@ location /t {
 GET /t
 --- error_code: 400
 --- response_body
-{"error_msg":"failed to check the configuration of plugin uri-blocker err: pcre_compile() failed: missing ) in \"^b(\""}
+{"error_msg":"failed to check the configuration of plugin uri-blocker err: pcre2_compile() failed: missing closing parenthesis in \"^b(\""}