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
commit 92e139a5876448b36f60294776d5a48f1df48db1 Author: Mark Thomas <ma...@apache.org> AuthorDate: Fri Sep 24 13:06:02 2021 +0100 Backport deprecation --- java/org/apache/coyote/AbstractProtocol.java | 2 ++ java/org/apache/tomcat/util/net/AprEndpoint.java | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/java/org/apache/coyote/AbstractProtocol.java b/java/org/apache/coyote/AbstractProtocol.java index a8b65db..58acf7d 100644 --- a/java/org/apache/coyote/AbstractProtocol.java +++ b/java/org/apache/coyote/AbstractProtocol.java @@ -764,6 +764,7 @@ public abstract class AbstractProtocol<S> implements ProtocolHandler, } + @SuppressWarnings("deprecation") @Override public SocketState process(SocketWrapperBase<S> wrapper, SocketEvent status) { if (getLog().isDebugEnabled()) { @@ -859,6 +860,7 @@ public abstract class AbstractProtocol<S> implements ProtocolHandler, } } + // Can switch to non-deprecated version in Tomcat 10.1.x processor.setSslSupport( wrapper.getSslSupport(getProtocol().getClientCertProvider())); diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java index b523c6c..f2e3973 100644 --- a/java/org/apache/tomcat/util/net/AprEndpoint.java +++ b/java/org/apache/tomcat/util/net/AprEndpoint.java @@ -2578,6 +2578,12 @@ public class AprEndpoint extends AbstractEndpoint<Long,Long> implements SNICallB @Override + public SSLSupport getSslSupport() { + throw new UnsupportedOperationException(); + } + + + @Override public void doClientAuth(SSLSupport sslSupport) throws IOException { long socket = getSocket().longValue(); // Configure connection to require a certificate. This requires a --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org