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.git
The following commit(s) were added to refs/heads/main by this push:
new cea8d63077 BZ 69936: Fix for Tomcat Native crashes triggered a memory
leak
cea8d63077 is described below
commit cea8d63077242af2c842cc5aa192ac150e97b243
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Jan 22 22:02:17 2026 +0000
BZ 69936: Fix for Tomcat Native crashes triggered a memory leak
Patch provided by Wes
https://bz.apache.org/bugzilla/show_bug.cgi?id=69936
---
java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java | 2 +-
webapps/docs/changelog.xml | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
b/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
index 4516e0b970..7cf6e7eafd 100644
--- a/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
+++ b/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
@@ -1405,7 +1405,7 @@ public final class OpenSSLEngine extends SSLEngine
implements SSLUtil.ProtocolIn
Lock readLock = AprStatus.getStatusLock().readLock();
readLock.lock();
try {
- if (!AprStatus.isAprInitialized()) {
+ if (AprStatus.isAprInitialized()) {
if (networkBIO != 0) {
SSL.freeBIO(networkBIO);
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a84e38881b..e3fdf17b79 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -223,6 +223,11 @@
Remove support for HTTP 0.9. (markt)
</update>
<!-- Entries for backport and removal before 12.0.0-M1 below this line
-->
+ <fix>
+ <bug>69936</bug>: Fix bug in previous fix for Tomcat Native crashes on
+ shutdown that triggered a significant memory leak. Patch provided by
+ Wes. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
