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 eb9852e Revert "Fix BZ 65714 - previous fix was incomplete."
eb9852e is described below
commit eb9852ea3c4b244d60ef41959d716a5c9ad1d23c
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Dec 9 13:56:11 2021 +0000
Revert "Fix BZ 65714 - previous fix was incomplete."
This reverts commit 1c36e565aec8b961878615b3bc7ceaee33245f16.
---
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 a958e99..fe5dc61 100644
--- a/java/org/apache/catalina/security/SecurityClassLoad.java
+++ b/java/org/apache/catalina/security/SecurityClassLoad.java
@@ -190,9 +190,6 @@ 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 08073da..94a4b41 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -112,10 +112,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: [email protected]
For additional commands, e-mail: [email protected]
