summaryrefslogtreecommitdiffstats
path: root/container-core
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2021-08-16 16:59:01 +0200
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2021-08-16 16:59:21 +0200
commit328ebf7b29037f8eeb5a360633f73b5200e23446 (patch)
tree08bcf409cf6d6d910b1677e2557f503ad6b522f8 /container-core
parent17bb9a4b26f4d83af4fc3dc4e711776ed401af5d (diff)
Only setup HTTP/2 clear text factory if enabled
This reverts commit d0e6cbfef4e0966bf4ee39fd12e3885bf8ff24ef.
Diffstat (limited to 'container-core')
-rw-r--r--container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java4
1 files changed, 3 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 5b9728b3544..f4f33afe535 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
@@ -100,7 +100,9 @@ public class ConnectorFactory {
}
return connectionFactoriesForTlsMixedMode(metric);
} else {
- return List.of(newHttp1ConnectionFactory(), newHttp2ClearTextConnectionFactory());
+ return connectorConfig.http2Enabled()
+ ? List.of(newHttp1ConnectionFactory(), newHttp2ClearTextConnectionFactory())
+ : List.of(newHttp1ConnectionFactory());
}
}