This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
The following commit(s) were added to refs/heads/main by this push:
new 7e8c2af43 Align SSL_CONF_CTX clean-up with SSL and SSL_CTX clean-up
7e8c2af43 is described below
commit 7e8c2af4383c14de4380e12b1cd130e7d05ae013
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 | 8 ++++++++
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/native/src/sslconf.c b/native/src/sslconf.c
index 54f7419de..b5ff3fd55 100644
--- a/native/src/sslconf.c
+++ b/native/src/sslconf.c
@@ -135,11 +135,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 5e2a1c301..ce8a20c84 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -32,6 +32,14 @@
</p>
</section>
<section name="2.0.13" rtext="in development">
+ <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>
<fix>
Remove group write permissions from the files in the tar.gz source
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
