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 83a03b434cb8d9b561656cd1dfaf2f91a0bf79cc
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Sep 14 18:48:13 2020 +0100
Use UPGRADED to ensure timeouts are processed
---
java/org/apache/coyote/AbstractProtocol.java | 2 +-
webapps/docs/changelog.xml | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/AbstractProtocol.java
b/java/org/apache/coyote/AbstractProtocol.java
index 248a26b..e214f80 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -901,7 +901,7 @@ public abstract class AbstractProtocol<S> implements
ProtocolHandler,
if (httpUpgradeHandler instanceof
InternalHttpUpgradeHandler) {
if (((InternalHttpUpgradeHandler)
httpUpgradeHandler).hasAsyncIO()) {
// The handler will initiate all further
I/O
- state = SocketState.LONG;
+ state = SocketState.UPGRADED;
}
}
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b840206..e10a44d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -59,6 +59,9 @@
Do not send an HTTP/2 PING frame to measure round-trip time when it is
known that the HTTP/2 connection is not in a good state. (markt)
</fix>
+ <fix>
+ Ensure HTTP/2 timeouts are processed for idle connections. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
