Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: upgrade openresty version to v1.27.11 #11936

Draft
wants to merge 10 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion apisix/ssl/router/radixtree_sni.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ install_curl () {

install_apisix_runtime() {
export runtime_version=${APISIX_RUNTIME}
wget "https://raw.githubusercontent.com/api7/apisix-build-tools/apisix-runtime/${APISIX_RUNTIME}/build-apisix-runtime.sh"
wget "https://raw.githubusercontent.com/shreemaan-abhishek/apisix-build-tools/refs/heads/12711/build-apisix-runtime.sh"
chmod +x build-apisix-runtime.sh
./build-apisix-runtime.sh latest
}
Expand Down
2 changes: 1 addition & 1 deletion t/node/grpc-proxy.t
Original file line number Diff line number Diff line change
Expand Up @@ -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



Expand Down
2 changes: 1 addition & 1 deletion t/plugin/proxy-mirror3.t
Original file line number Diff line number Diff line change
Expand Up @@ -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/
4 changes: 2 additions & 2 deletions t/plugin/uri-blocker.t
Original file line number Diff line number Diff line change
Expand Up @@ -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 \".+(\""}



Expand Down Expand Up @@ -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(\""}



Expand Down
Loading