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
The following commit(s) were added to refs/heads/8.5.x by this push: new a7386ee Revert unnecessary back-port a7386ee is described below commit a7386ee2d6850c77e494852289107c71f6f24b91 Author: Mark Thomas <ma...@apache.org> AuthorDate: Tue Jun 4 16:28:18 2019 +0100 Revert unnecessary back-port --- java/org/apache/coyote/AbstractProtocol.java | 7 ------- .../apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java | 4 ---- 2 files changed, 11 deletions(-) diff --git a/java/org/apache/coyote/AbstractProtocol.java b/java/org/apache/coyote/AbstractProtocol.java index 4cbda42..837f805 100644 --- a/java/org/apache/coyote/AbstractProtocol.java +++ b/java/org/apache/coyote/AbstractProtocol.java @@ -35,7 +35,6 @@ import javax.management.ObjectName; import javax.servlet.http.HttpUpgradeHandler; import javax.servlet.http.WebConnection; -import org.apache.coyote.http11.upgrade.InternalHttpUpgradeHandler; import org.apache.juli.logging.Log; import org.apache.tomcat.InstanceManager; import org.apache.tomcat.util.ExceptionUtils; @@ -861,12 +860,6 @@ public abstract class AbstractProtocol<S> implements ProtocolHandler, upgradeToken.getContextBind().unbind(false, oldCL); } } - if (httpUpgradeHandler instanceof InternalHttpUpgradeHandler) { - if (((InternalHttpUpgradeHandler) httpUpgradeHandler).hasAsyncIO()) { - // The handler will initiate all further I/O - state = SocketState.LONG; - } - } } } } while ( state == SocketState.UPGRADING); diff --git a/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java b/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java index 8c5ce39..936784e 100644 --- a/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java +++ b/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java @@ -37,8 +37,4 @@ public interface InternalHttpUpgradeHandler extends HttpUpgradeHandler { void setSslSupport(SSLSupport sslSupport); void pause(); - - default boolean hasAsyncIO() { - return false; - } } \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org