This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 1c36e56 Fix BZ 65714 - previous fix was incomplete.
1c36e56 is described below
commit 1c36e565aec8b961878615b3bc7ceaee33245f16
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Dec 9 10:24:07 2021 +0000
Fix BZ 65714 - previous fix was incomplete.
https://bz.apache.org/bugzilla/show_bug.cgi?id=65714
---
java/org/apache/catalina/security/SecurityClassLoad.java | 3 +++
webapps/docs/changelog.xml | 4 ++++
2 files changed, 7 insertions(+)
diff --git a/java/org/apache/catalina/security/SecurityClassLoad.java
b/java/org/apache/catalina/security/SecurityClassLoad.java
index fe5dc61..a958e99 100644
--- a/java/org/apache/catalina/security/SecurityClassLoad.java
+++ b/java/org/apache/catalina/security/SecurityClassLoad.java
@@ -190,6 +190,9 @@ public final class SecurityClassLoad {
loader.loadClass(basePackage +
"util.net.AprEndpoint$AprSocketWrapper$AprOperationState");
loader.loadClass(basePackage +
"util.net.NioEndpoint$NioSocketWrapper$NioOperationState");
loader.loadClass(basePackage +
"util.net.Nio2Endpoint$Nio2SocketWrapper$Nio2OperationState");
+ loader.loadClass(basePackage + "util.net.SecureNio2Channel");
+ loader.loadClass(basePackage + "util.net.SocketBufferHandler");
+ loader.loadClass(basePackage + "util.net.SocketBufferHandler$1");
loader.loadClass(basePackage +
"util.net.SocketWrapperBase$BlockingMode");
loader.loadClass(basePackage +
"util.net.SocketWrapperBase$CompletionCheck");
loader.loadClass(basePackage +
"util.net.SocketWrapperBase$CompletionHandlerCall");
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 94a4b41..08073da 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -112,6 +112,10 @@
request includes a body. The maximum permitted size of the body is
controlled by <code>maxSavePostSize</code>. (markt)
</fix>
+ <fix>
+ <bug>65714</bug>: The previous fix was incomplete. Fix additional
issues
+ when first using an NIO2 TLS enabled connector. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
