diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-04-15 13:10:10 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-04-15 13:10:10 +0200 |
| commit | c71fd7a333c01841e8cda45300e183e9ca2f0f43 (patch) | |
| tree | 3205d5e73512cfc9e959b244fe785fe4f904c700 /container-core | |
| parent | 81fad70d16a8494ce0464af6ee4ba9c0e12f6a6e (diff) | |
Delegate to ssl before alpn
Diffstat (limited to 'container-core')
| -rw-r--r-- | container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java | 4 |
1 files changed, 2 insertions, 2 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 bc358e2fb06..0a109f5baf5 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 @@ -107,11 +107,11 @@ public class ConnectorFactory { SslConnectionFactory sslFactory = newSslConnectionFactory(metric, alpnFactory); if (proxyProtocolConfig.enabled()) { if (proxyProtocolConfig.mixedMode()) { - ProxyConnectionFactory proxyProtocolFactory = newProxyProtocolConnectionFactory(alpnFactory); + ProxyConnectionFactory proxyProtocolFactory = newProxyProtocolConnectionFactory(sslFactory); DetectorConnectionFactory detectorFactory = newDetectorConnectionFactory(sslFactory, proxyProtocolFactory); return List.of(detectorFactory, proxyProtocolFactory, sslFactory, alpnFactory, http1Factory, http2Factory); } else { - ProxyConnectionFactory proxyProtocolFactory = newProxyProtocolConnectionFactory(alpnFactory); + ProxyConnectionFactory proxyProtocolFactory = newProxyProtocolConnectionFactory(sslFactory); return List.of(proxyProtocolFactory, sslFactory, alpnFactory, http1Factory, http2Factory); } } else { |