This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 354d6342603358076d0a256c67de98d9bc2dd475 Author: Mark Thomas <[email protected]> AuthorDate: Fri Jun 26 15:31:00 2020 +0100 SocketWrapper.upgraded is no longer used It used to be used to determine if the processor should be recycled. It has been replaced by a flag on the processor. --- java/org/apache/coyote/AbstractProtocol.java | 2 -- java/org/apache/tomcat/util/net/SocketWrapperBase.java | 12 ++++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/java/org/apache/coyote/AbstractProtocol.java b/java/org/apache/coyote/AbstractProtocol.java index 577ebbf..bbb897a 100644 --- a/java/org/apache/coyote/AbstractProtocol.java +++ b/java/org/apache/coyote/AbstractProtocol.java @@ -853,8 +853,6 @@ public abstract class AbstractProtocol<S> implements ProtocolHandler, processor, wrapper)); } wrapper.unRead(leftOverInput); - // Mark the connection as upgraded - wrapper.setUpgraded(true); // Associate with the processor with the connection connections.put(socket, processor); // Initialise the upgrade handler (which may trigger diff --git a/java/org/apache/tomcat/util/net/SocketWrapperBase.java b/java/org/apache/tomcat/util/net/SocketWrapperBase.java index c14471b..121293e 100644 --- a/java/org/apache/tomcat/util/net/SocketWrapperBase.java +++ b/java/org/apache/tomcat/util/net/SocketWrapperBase.java @@ -151,7 +151,19 @@ public abstract class SocketWrapperBase<E> { } } + /** + * @return {@code true} if the connection has been upgraded. + * + * @deprecated Unused. Will be removed in Tomcat 10. + */ + @Deprecated public boolean isUpgraded() { return upgraded; } + /** + * @param upgraded {@code true} if the connection has been upgraded. + * + * @deprecated Unused. Will be removed in Tomcat 10. + */ + @Deprecated public void setUpgraded(boolean upgraded) { this.upgraded = upgraded; } public boolean isSecure() { return secure; } public void setSecure(boolean secure) { this.secure = secure; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
