From a14d9247d3d0ab191e3928b53689beb04349b191 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Mon, 16 Aug 2021 17:03:21 +0200 Subject: HTTP/2 is enabled by default --- .../src/test/java/com/yahoo/jdisc/http/server/jetty/JettyTestDriver.java | 1 - .../test/java/com/yahoo/jdisc/http/server/jetty/ProxyProtocolTest.java | 1 - 2 files changed, 2 deletions(-) diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/JettyTestDriver.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/JettyTestDriver.java index 57438cbe207..cf226d7cd18 100644 --- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/JettyTestDriver.java +++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/JettyTestDriver.java @@ -75,7 +75,6 @@ public class JettyTestDriver { requestHandler, new ServerConfig.Builder().connectionLog(new ServerConfig.ConnectionLog.Builder().enabled(true)), new ConnectorConfig.Builder() - .http2Enabled(true) .ssl(new ConnectorConfig.Ssl.Builder() .enabled(true) .clientAuth(tlsClientAuth == TlsClientAuth.NEED diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ProxyProtocolTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ProxyProtocolTest.java index d29abea024e..fe62a9641de 100644 --- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ProxyProtocolTest.java +++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ProxyProtocolTest.java @@ -119,7 +119,6 @@ class ProxyProtocolTest { Path certificateFile, Path privateKeyFile, RequestLog requestLog, ConnectionLog connectionLog, boolean mixedMode) { ConnectorConfig.Builder connectorConfig = new ConnectorConfig.Builder() - .http2Enabled(true) .proxyProtocol(new ConnectorConfig.ProxyProtocol.Builder() .enabled(true) .mixedMode(mixedMode)) -- cgit v1.2.3