You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2021/01/29 08:51:12 UTC

[tomcat] branch 8.5.x updated: Drop fix for 65111 as it is causing crashes

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
     new 9668330  Drop fix for 65111 as it is causing crashes
9668330 is described below

commit 96683304d326d90e97aa313a7712aee999320179
Author: remm <re...@apache.org>
AuthorDate: Fri Jan 29 09:50:27 2021 +0100

    Drop fix for 65111 as it is causing crashes
---
 java/org/apache/tomcat/util/net/AprEndpoint.java | 1 -
 webapps/docs/changelog.xml                       | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 14a2ed5..b0aacf5 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -2317,7 +2317,6 @@ public class AprEndpoint extends AbstractEndpoint<Long> implements SNICallBack {
                     return;
                 }
                 closed = true;
-                socketBufferHandler.free();
                 if (sslOutputBuffer != null) {
                     ByteBufferUtils.cleanDirectBuffer(sslOutputBuffer);
                 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 35e4475..9b3aa82 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -118,10 +118,6 @@
         Ensure that SNI provided host names are matched to SSL virtual host
         configurations in a case insensitive manner. (markt)
       </fix>
-      <fix>
-        <bug>65111</bug>: Free direct memory buffers in the APR connector.
-        (remm)
-      </fix>
     </changelog>
   </subsection>
 </section>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org