This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new e497dbc 65111: Free direct buffers
e497dbc is described below
commit e497dbc65af28ed9178a650c60eb139623750344
Author: remm <r...@apache.org>
AuthorDate: Thu Jan 28 15:53:05 2021 +0100
65111: Free direct buffers
Unlike for NIO and NIO2, the SocketBufferHandler free method was never
called for the APR connector.
---
java/org/apache/tomcat/util/net/AprEndpoint.java | 1 +
webapps/docs/changelog.xml | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 4ba3420..cb67e07 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -2231,6 +2231,7 @@ public class AprEndpoint extends
AbstractEndpoint<Long,Long> implements SNICallB
log.debug("Calling [" + getEndpoint() + "].closeSocket([" +
this + "])");
}
getEndpoint().connections.remove(getSocket());
+ socketBufferHandler.free();
socketBufferHandler = SocketBufferHandler.EMPTY;
nonBlockingWriteBuffer.clear();
if (sslOutputBuffer != null) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 84a997e..b9bb70f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -110,6 +110,10 @@
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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
