diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-05-02 16:47:05 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-05-02 16:47:05 +0200 |
commit | cd4205e182d30cf4f4d356cf9f3508b970d086e7 (patch) | |
tree | 63cb5b88f4a0000b68d7f498c6929605ceb62d14 /container-core/src/main/java/com | |
parent | b0e2a381a48fac01f24a51dacfefc13530e4630e (diff) |
Use valid protocol names in ALPN configuration
Diffstat (limited to 'container-core/src/main/java/com')
-rw-r--r-- | container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java | 11 |
1 files changed, 4 insertions, 7 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 71c0b3a0225..b9b6bcf57f0 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 @@ -20,7 +20,6 @@ import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.SslConnectionFactory; import org.eclipse.jetty.util.ssl.SslContextFactory; -import java.util.Collection; import java.util.List; /** @@ -103,7 +102,7 @@ public class ConnectorFactory { HttpConnectionFactory http1Factory = newHttp1ConnectionFactory(); if (connectorConfig.http2Enabled()) { HTTP2ServerConnectionFactory http2Factory = newHttp2ConnectionFactory(); - ALPNServerConnectionFactory alpnFactory = newAlpnConnectionFactory(List.of(http1Factory, http2Factory), http1Factory); + ALPNServerConnectionFactory alpnFactory = newAlpnConnectionFactory(); SslConnectionFactory sslFactory = newSslConnectionFactory(metric, alpnFactory); if (proxyProtocolConfig.enabled()) { ProxyConnectionFactory proxyProtocolFactory = newProxyProtocolConnectionFactory(sslFactory); @@ -170,11 +169,9 @@ public class ConnectorFactory { return connectionFactory; } - private ALPNServerConnectionFactory newAlpnConnectionFactory(Collection<ConnectionFactory> alternatives, - ConnectionFactory defaultFactory) { - String[] protocols = alternatives.stream().map(ConnectionFactory::getProtocol).toArray(String[]::new); - ALPNServerConnectionFactory factory = new ALPNServerConnectionFactory(protocols); - factory.setDefaultProtocol(defaultFactory.getProtocol()); + private ALPNServerConnectionFactory newAlpnConnectionFactory() { + ALPNServerConnectionFactory factory = new ALPNServerConnectionFactory("h2", "http/1.1"); + factory.setDefaultProtocol("http/1.1"); return factory; } |