This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 1.3.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
The following commit(s) were added to refs/heads/1.3.x by this push:
new 0a850bc4d Align SSL_CONF_CTX clean-up with SSL and SSL_CTX clean-up
0a850bc4d is described below
commit 0a850bc4de29e10c87a5571bbb7daffbb25174de
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Jan 20 23:34:04 2026 +0000
Align SSL_CONF_CTX clean-up with SSL and SSL_CTX clean-up
---
native/src/sslconf.c | 6 +-----
xdocs/miscellaneous/changelog.xml | 6 ++++++
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/native/src/sslconf.c b/native/src/sslconf.c
index a3e2e191a..68d4cdd87 100644
--- a/native/src/sslconf.c
+++ b/native/src/sslconf.c
@@ -137,11 +137,7 @@ TCN_IMPLEMENT_CALL(void, SSLConf, free)(TCN_STDARGS, jlong
cctx)
tcn_ssl_conf_ctxt_t *c = J2P(cctx, tcn_ssl_conf_ctxt_t *);
UNREFERENCED_STDARGS;
TCN_ASSERT(c != 0);
- if (c->cctx != NULL) {
- SSL_CONF_CTX_free(c->cctx);
- c->cctx = NULL;
- c->pool = NULL;
- }
+ apr_pool_cleanup_run(c->pool, c, ssl_ctx_config_cleanup);
}
/* Check a command for an SSL_CONF context */
diff --git a/xdocs/miscellaneous/changelog.xml
b/xdocs/miscellaneous/changelog.xml
index 87c095139..906d20200 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -32,6 +32,12 @@
</p>
</section>
<section name="1.3.6" rtext="in develoment">
+ <changelog>
+ <scode>
+ Refactor the SSL_CONF_CTX clean-up to align it with SSL and SSL_CTX
+ clean-up. (markt)
+ </scode>
+ </changelog>
</section>
<section name="1.3.5" rtext="2026-01-19">
<changelog>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
