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 9014d75 Revert "Fix BZ 65714 - previous fix was incomplete."
9014d75 is described below
commit 9014d75c9d1265ece592f53d4cb18a7634c6f405
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Dec 9 13:55:54 2021 +0000
Revert "Fix BZ 65714 - previous fix was incomplete."
This reverts commit bb432a0fea83f424b013267ba7675c5d636a465a.
---
java/org/apache/catalina/security/SecurityClassLoad.java | 3 ---
webapps/docs/changelog.xml | 4 ----
2 files changed, 7 deletions(-)
diff --git a/java/org/apache/catalina/security/SecurityClassLoad.java
b/java/org/apache/catalina/security/SecurityClassLoad.java
index fdb915c..62951ec 100644
--- a/java/org/apache/catalina/security/SecurityClassLoad.java
+++ b/java/org/apache/catalina/security/SecurityClassLoad.java
@@ -189,9 +189,6 @@ public final class SecurityClassLoad {
loader.loadClass(basePackage + "util.net.DispatchType");
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 061588c..e7ab2d7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -121,10 +121,6 @@
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
