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 015c48b Additional clean-up after removal of APR
015c48b is described below
commit 015c48b6b537ea3e329a5f23bb68be052b1b0221
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Sep 24 12:59:19 2021 +0100
Additional clean-up after removal of APR
---
java/org/apache/tomcat/util/net/Nio2Endpoint.java | 6 +-----
java/org/apache/tomcat/util/net/NioEndpoint.java | 6 +-----
.../apache/tomcat/util/net/SocketWrapperBase.java | 22 +++++++++++++++++++++-
3 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index f80dd5d..2c56ddd 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -1531,12 +1531,8 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint<Nio2Channel,AsynchronousS
}
- /**
- * {@inheritDoc}
- * @param clientCertProvider Ignored for this implementation
- */
@Override
- public SSLSupport getSslSupport(String clientCertProvider) {
+ public SSLSupport getSslSupport() {
if (getSocket() instanceof SecureNio2Channel) {
SecureNio2Channel ch = (SecureNio2Channel) getSocket();
return ch.getSSLSupport();
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 9cfcd47..81be955 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -1459,12 +1459,8 @@ public class NioEndpoint extends
AbstractJsseEndpoint<NioChannel,SocketChannel>
}
- /**
- * {@inheritDoc}
- * @param clientCertProvider Ignored for this implementation
- */
@Override
- public SSLSupport getSslSupport(String clientCertProvider) {
+ public SSLSupport getSslSupport() {
if (getSocket() instanceof SecureNioChannel) {
SecureNioChannel ch = (SecureNioChannel) getSocket();
return ch.getSSLSupport();
diff --git a/java/org/apache/tomcat/util/net/SocketWrapperBase.java
b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
index 117bce8..27660fc 100644
--- a/java/org/apache/tomcat/util/net/SocketWrapperBase.java
+++ b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
@@ -788,7 +788,27 @@ public abstract class SocketWrapperBase<E> {
*/
public abstract void doClientAuth(SSLSupport sslSupport) throws
IOException;
- public abstract SSLSupport getSslSupport(String clientCertProvider);
+ /**
+ * Obtain an SSLSupport instance for this socket.
+ *
+ * @param clientCertProvider The name of the client certificate provider to
+ * use. Only used by APR/native.
+ *
+ * @return An SSLSupport instance for this socket.
+ *
+ * @deprecated Will be removed in Tomcat 10.1.x onwards
+ */
+ @Deprecated
+ public SSLSupport getSslSupport(String clientCertProvider) {
+ return getSslSupport();
+ }
+
+ /**
+ * Obtain an SSLSupport instance for this socket.
+ *
+ * @return An SSLSupport instance for this socket.
+ */
+ public abstract SSLSupport getSslSupport();
// ------------------------------------------------------- NIO 2 style APIs
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
