This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 977d440678168f15388f4ae510d997267e98eb4c Author: Mark Thomas <[email protected]> AuthorDate: Fri Jun 26 16:12:34 2020 +0100 socketWrapper.secure is no longer used It is used in 7.0.x to trigger additional debug logging. --- java/org/apache/tomcat/util/net/AprEndpoint.java | 1 - java/org/apache/tomcat/util/net/Nio2Endpoint.java | 1 - java/org/apache/tomcat/util/net/NioEndpoint.java | 1 - java/org/apache/tomcat/util/net/SocketWrapperBase.java | 12 ++++++++++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java index ec9deee..3996087 100644 --- a/java/org/apache/tomcat/util/net/AprEndpoint.java +++ b/java/org/apache/tomcat/util/net/AprEndpoint.java @@ -680,7 +680,6 @@ public class AprEndpoint extends AbstractEndpoint<Long,Long> implements SNICallB AprSocketWrapper wrapper = new AprSocketWrapper(socket, this); connections.put(socket, wrapper); wrapper.setKeepAliveLeft(getMaxKeepAliveRequests()); - wrapper.setSecure(isSSLEnabled()); wrapper.setReadTimeout(getConnectionTimeout()); wrapper.setWriteTimeout(getConnectionTimeout()); getExecutor().execute(new SocketWithOptionsProcessor(wrapper)); diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java b/java/org/apache/tomcat/util/net/Nio2Endpoint.java index e54a90e..2e3a5af 100644 --- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java +++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java @@ -319,7 +319,6 @@ public class Nio2Endpoint extends AbstractJsseEndpoint<Nio2Channel,AsynchronousS socketWrapper.setReadTimeout(getConnectionTimeout()); socketWrapper.setWriteTimeout(getConnectionTimeout()); socketWrapper.setKeepAliveLeft(Nio2Endpoint.this.getMaxKeepAliveRequests()); - socketWrapper.setSecure(isSSLEnabled()); // Continue processing on the same thread as the acceptor is async return processSocket(socketWrapper, SocketEvent.OPEN_READ, false); } catch (Throwable t) { diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java index ce7dfc5..9bff874 100644 --- a/java/org/apache/tomcat/util/net/NioEndpoint.java +++ b/java/org/apache/tomcat/util/net/NioEndpoint.java @@ -366,7 +366,6 @@ public class NioEndpoint extends AbstractJsseEndpoint<NioChannel,SocketChannel> socketWrapper.setReadTimeout(getConnectionTimeout()); socketWrapper.setWriteTimeout(getConnectionTimeout()); socketWrapper.setKeepAliveLeft(NioEndpoint.this.getMaxKeepAliveRequests()); - socketWrapper.setSecure(isSSLEnabled()); poller.register(channel, socketWrapper); return true; } catch (Throwable t) { diff --git a/java/org/apache/tomcat/util/net/SocketWrapperBase.java b/java/org/apache/tomcat/util/net/SocketWrapperBase.java index df61d53..0e5fb85 100644 --- a/java/org/apache/tomcat/util/net/SocketWrapperBase.java +++ b/java/org/apache/tomcat/util/net/SocketWrapperBase.java @@ -185,7 +185,19 @@ public abstract class SocketWrapperBase<E> { */ @Deprecated public void setUpgraded(boolean upgraded) { this.upgraded = upgraded; } + /** + * @return {@code true} if the connection uses TLS + * + * @deprecated Unused. Will be removed in Tomcat 10. + */ + @Deprecated public boolean isSecure() { return secure; } + /** + * @param secure {@code true} if the connection uses TLS + * + * @deprecated Unused. Will be removed in Tomcat 10. + */ + @Deprecated public void setSecure(boolean secure) { this.secure = secure; } public String getNegotiatedProtocol() { return negotiatedProtocol; } public void setNegotiatedProtocol(String negotiatedProtocol) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
