On Thu, Jan 22, 2026 at 11:03 PM <[email protected]> wrote:
>
> This is an automated email from the ASF dual-hosted git repository.
>
> markt pushed a commit to branch 10.1.x
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>
>
> The following commit(s) were added to refs/heads/10.1.x by this push:
> new 85199631d1 BZ 69936: Fix for Tomcat Native crashes triggered a
> memory leak
> 85199631d1 is described below
>
> commit 85199631d1ff9d9ef2bfeede115bc425b4a10b21
> 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
Indeed 9.0 does not need that.
So 9.0 did not get 0f5fee193af89af53bba72fbc6477aac74af6d6c (adding
ReentrantReadWriteLock getStatusLock()), do you remember why ?
Rémy
> ---
> java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java | 2 +-
> webapps/docs/changelog.xml | 9 +++++++++
> 2 files changed, 10 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 27d1c67a41..af8fddf217 100644
> --- a/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
> +++ b/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
> @@ -1457,7 +1457,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 99ed748b87..b023f0d330 100644
> --- a/webapps/docs/changelog.xml
> +++ b/webapps/docs/changelog.xml
> @@ -105,6 +105,15 @@
> issues do not "pop up" wrt. others).
> -->
> <section name="Tomcat 10.1.52 (schultz)" rtext="in development">
> + <subsection name="Coyote">
> + <changelog>
> + <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>
> </section>
> <section name="Tomcat 10.1.51 (schultz)" rtext="release in progress">
> <subsection name="Catalina">
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [email protected]
> For additional commands, e-mail: [email protected]
>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]