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
The following commit(s) were added to refs/heads/master by this push:
new 863b18e Extend the timeout functionality to internal upgrade
processors
863b18e is described below
commit 863b18e34f12085820ad02e86ca0ef7e961bb471
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Aug 7 18:59:07 2019 +0100
Extend the timeout functionality to internal upgrade processors
---
.../apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java | 2 ++
java/org/apache/coyote/http11/upgrade/UpgradeProcessorInternal.java | 6 ++++++
java/org/apache/coyote/http2/Http2UpgradeHandler.java | 6 ++++++
java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java | 6 ++++++
.../apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java | 5 +++++
5 files changed, 25 insertions(+)
diff --git
a/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java
b/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java
index 8c5ce39..e7d3453 100644
--- a/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java
+++ b/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java
@@ -32,6 +32,8 @@ public interface InternalHttpUpgradeHandler extends
HttpUpgradeHandler {
SocketState upgradeDispatch(SocketEvent status);
+ void timeoutAsync(long now);
+
void setSocketWrapper(SocketWrapperBase<?> wrapper);
void setSslSupport(SSLSupport sslSupport);
diff --git
a/java/org/apache/coyote/http11/upgrade/UpgradeProcessorInternal.java
b/java/org/apache/coyote/http11/upgrade/UpgradeProcessorInternal.java
index 6397a72..f0f5460 100644
--- a/java/org/apache/coyote/http11/upgrade/UpgradeProcessorInternal.java
+++ b/java/org/apache/coyote/http11/upgrade/UpgradeProcessorInternal.java
@@ -73,6 +73,12 @@ public class UpgradeProcessorInternal extends
UpgradeProcessorBase {
}
+ @Override
+ public void timeoutAsync(long now) {
+ internalHttpUpgradeHandler.timeoutAsync(now);
+ }
+
+
// --------------------------------------------------- AutoCloseable
methods
@Override
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 41c620d..a19ba6c 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -391,6 +391,12 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
}
+ @Override
+ public void timeoutAsync(long now) {
+ // TODO: Implement improved connection timeouts
+ }
+
+
ConnectionSettingsRemote getRemoteSettings() {
return remoteSettings;
}
diff --git a/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
b/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
index a1b82ea..84b70c6 100644
--- a/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
+++ b/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
@@ -191,6 +191,12 @@ public class WsHttpUpgradeHandler implements
InternalHttpUpgradeHandler {
@Override
+ public void timeoutAsync(long now) {
+ // NO-OP
+ }
+
+
+ @Override
public void pause() {
// NO-OP
}
diff --git
a/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
b/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
index aaee563..f436240 100644
--- a/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
+++ b/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
@@ -259,6 +259,11 @@ public class TestUpgradeInternalHandler extends
TomcatBaseTest {
}
@Override
+ public void timeoutAsync(long now) {
+ // NO-OP
+ }
+
+ @Override
public void setSocketWrapper(SocketWrapperBase<?> wrapper) {
this.wrapper = wrapper;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
