summaryrefslogtreecommitdiffstats
path: root/container-core
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2021-08-17 15:35:47 +0200
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2021-08-17 15:35:47 +0200
commita7bf893f41beb5312ac2050371f0a292d4f66bd3 (patch)
treef8f5be3d245eecc29d3012cac1763c702ed356e3 /container-core
parent86a7a62175d555296b0ec0e318d6fe790b1f6c14 (diff)
Handle implicit TLS being disabled
Diffstat (limited to 'container-core')
-rw-r--r--container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java2
1 files changed, 1 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 f4f33afe535..91b51b6e9ec 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
@@ -90,7 +90,7 @@ public class ConnectorFactory {
}
private List<ConnectionFactory> createConnectionFactories(Metric metric) {
- boolean vespaTlsEnabled = TransportSecurityUtils.isTransportSecurityEnabled();
+ boolean vespaTlsEnabled = TransportSecurityUtils.isTransportSecurityEnabled() && connectorConfig.implicitTlsEnabled();
MixedMode tlsMixedMode = TransportSecurityUtils.getInsecureMixedMode();
if (connectorConfig.ssl().enabled() || (vespaTlsEnabled && tlsMixedMode == DISABLED)) {
return connectionFactoriesForHttps(metric);