Use same idle timeout for HTTP/2 stream and connections

1 files changed, 4 insertions, 1 deletions

diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java
index 0d3ab1ce32d..fc39de72018 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java
@@ -75,7 +75,7 @@ public class ConnectorFactory {
         connector.setName(connectorConfig.name());
         connector.setAcceptQueueSize(connectorConfig.acceptQueueSize());
         connector.setReuseAddress(connectorConfig.reuseAddress());
-        connector.setIdleTimeout((long)(connectorConfig.idleTimeout() * 1000.0));
+        connector.setIdleTimeout(idleTimeoutInMillis());
         return connector;
     }
 
@@ -162,6 +162,7 @@ public class ConnectorFactory {
 
     private HTTP2ServerConnectionFactory newHttp2ConnectionFactory() {
         HTTP2ServerConnectionFactory factory = new HTTP2ServerConnectionFactory(newHttpConfiguration());
+        factory.setStreamIdleTimeout(idleTimeoutInMillis());
         factory.setMaxConcurrentStreams(4096);
         return factory;
     }
@@ -193,4 +194,6 @@ public class ConnectorFactory {
                 || (config.implicitTlsEnabled() && TransportSecurityUtils.isTransportSecurityEnabled());
     }
 
+    private long idleTimeoutInMillis() { return (long) (connectorConfig.idleTimeout() * 1000.0); }
+
 }