From 1f522e5cf8a9f0555244575a79becccd82b41ecb Mon Sep 17 00:00:00 2001
From: Julian Nguyen <109386615+juliannguyen4@users.noreply.github.com>
Date: Fri, 18 Sep 2026 10:26:52 -0700
Subject: [PATCH 1/3] fix: update c client to address definitely lost memory
 leak from SSL object

---
 .gitmodules        | 2 +-
 aerospike-client-c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 136ba68cbe..3881dc044a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,4 +2,4 @@
 	path = aerospike-client-c
 	# url = git@github.com:aerospike/aerospike-client-c.git
 	url = https://github.com/aerospike/aerospike-client-c.git
-	branch = stage
+	branch = jnguyen/CLIENT-5476-fix-SSL-memory-leak-from-as_conn_recover-at-cluster-teardown
diff --git a/aerospike-client-c b/aerospike-client-c
index c41e4958ba..9bf4399236 160000
--- a/aerospike-client-c
+++ b/aerospike-client-c
@@ -1 +1 @@
-Subproject commit c41e4958baf3194c962689552cb6b7e5c65e2277
+Subproject commit 9bf43992363efcc68f0033336edd8cadb0621068

From 2b7b049d4e3e09e2d1a51339e1927cf71307a93d Mon Sep 17 00:00:00 2001
From: Julian Nguyen <109386615+juliannguyen4@users.noreply.github.com>
Date: Fri, 18 Sep 2026 10:49:18 -0700
Subject: [PATCH 2/3] ci: instead of manually inspecting the cicd valgrind logs
 if the leak was suppressed, fail out in this feature branch if the leak still
 occurs without the suppression

---
 test/valgrind-python.supp | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/test/valgrind-python.supp b/test/valgrind-python.supp
index 1ea736bb9d..f711ff1045 100644
--- a/test/valgrind-python.supp
+++ b/test/valgrind-python.supp
@@ -502,25 +502,6 @@
 
 # Custom suppressions
 
-{
-   Known memory leak that intermittently shows up but is hard to reproduce with a subset of the test suite
-   Memcheck:Leak
-   fun:malloc
-   fun:CRYPTO_zalloc
-   fun:SSL_new
-   fun:as_tls_wrap
-   fun:as_socket_wrap
-   fun:as_socket_create
-   fun:as_node_try_family_connections
-   fun:as_node_create_socket
-   fun:as_node_create_connection
-   fun:as_node_get_connection
-   fun:as_info_command_node
-   fun:aerospike_info_foreach
-   fun:AerospikeClient_InfoAll_Invoke
-   fun:AerospikeClient_InfoAll
-}
-
 {
    Known memory leak that intermittently shows up
    Memcheck:Leak

From 70c322ef40df0a8181e045cf5e0cfac33c854024 Mon Sep 17 00:00:00 2001
From: Julian Nguyen <109386615+juliannguyen4@users.noreply.github.com>
Date: Fri, 18 Sep 2026 15:10:03 -0700
Subject: [PATCH 3/3] refactor: point c client to stage with the new mem leak
 fix. then re-run valgrind

---
 .gitmodules        | 2 +-
 aerospike-client-c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 3881dc044a..136ba68cbe 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,4 +2,4 @@
 	path = aerospike-client-c
 	# url = git@github.com:aerospike/aerospike-client-c.git
 	url = https://github.com/aerospike/aerospike-client-c.git
-	branch = jnguyen/CLIENT-5476-fix-SSL-memory-leak-from-as_conn_recover-at-cluster-teardown
+	branch = stage
diff --git a/aerospike-client-c b/aerospike-client-c
index 9bf4399236..d3bc0624f7 160000
--- a/aerospike-client-c
+++ b/aerospike-client-c
@@ -1 +1 @@
-Subproject commit 9bf43992363efcc68f0033336edd8cadb0621068
+Subproject commit d3bc0624f7ee871db0bafd283dfa0a6a6f5d71e1