From c46d6b89a602a39f73e3bf0a8dd869bfb2956f87 Mon Sep 17 00:00:00 2001 From: Xie Han <63350856@qq.com> Date: Wed, 1 Apr 2026 15:22:48 +0800 Subject: [PATCH 1/2] Fix WFConsultClient::init() bug when specifying an SSL_CTX. --- src/client/WFConsulClient.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/WFConsulClient.h b/src/client/WFConsulClient.h index f403c63c..8b576933 100644 --- a/src/client/WFConsulClient.h +++ b/src/client/WFConsulClient.h @@ -144,9 +144,9 @@ public: } // with specific SSL_CTX - int init(const std::string& proxy_url, SSL_CTX *ctx_ctx) + int init(const std::string& proxy_url, SSL_CTX *ctx) { - return this->init(proxy_url, protocol::ConsulConfig(), ssl_ctx); + return this->init(proxy_url, protocol::ConsulConfig(), ctx); } int init(const std::string& proxy_url, protocol::ConsulConfig config, From 8dc650227603f382d4e91f95d524b522ff027f0b Mon Sep 17 00:00:00 2001 From: liyingxin Date: Wed, 1 Apr 2026 21:33:59 +0800 Subject: [PATCH 2/2] Fix UpstreamPolicie: use size_t when counting for cur_idx. (#1809) --- src/nameservice/UpstreamPolicies.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nameservice/UpstreamPolicies.cc b/src/nameservice/UpstreamPolicies.cc index bef8f543..6f487568 100644 --- a/src/nameservice/UpstreamPolicies.cc +++ b/src/nameservice/UpstreamPolicies.cc @@ -612,8 +612,8 @@ void UPSWeightedRandomPolicy::fuse_one_server(const EndpointAddress *addr) EndpointAddress *UPSVNSWRRPolicy::first_strategy(const ParsedURI& uri, WFNSTracing *tracing) { - int idx = this->cur_idx.fetch_add(1); - int pos = 0; + size_t idx = this->cur_idx.fetch_add(1); + size_t pos = 0; for (int i = 0; i < this->total_weight; i++, idx++) { pos = this->pre_generated_vec[idx % this->pre_generated_vec.size()];