diff options
| author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-10-06 08:46:13 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-10-06 09:16:36 +0200 |
| commit | af1ddbb1b165ec65eefa7f2471c38f6bd116de49 (patch) | |
| tree | cb0523a2d8e7e08a81687dd158d971a6c509fe86 /container-core/src/main | |
| parent | 24c70d22397fad2c2d5d2e8b45d7da664283fd85 (diff) | |
Allow default server name to be overridden
Diffstat (limited to 'container-core/src/main')
| -rw-r--r-- | container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java | 3 | ||||
| -rw-r--r-- | container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.connector.def | 4 |
2 files changed, 7 insertions, 0 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 a9385060010..bf278981b69 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 @@ -23,6 +23,7 @@ import org.eclipse.jetty.server.SecureRequestCustomizer; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.SslConnectionFactory; +import org.eclipse.jetty.util.HostPort; import org.eclipse.jetty.util.ssl.SslContextFactory; import java.util.ArrayList; @@ -154,6 +155,8 @@ public class ConnectorFactory { if (isSslEffectivelyEnabled(connectorConfig)) { httpConfig.addCustomizer(new SecureRequestCustomizer()); } + String serverNameFallback = connectorConfig.serverName().fallback(); + if (!serverNameFallback.isBlank()) httpConfig.setServerAuthority(new HostPort(serverNameFallback)); return httpConfig; } diff --git a/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.connector.def b/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.connector.def index e808b565e8b..1f4763d32a7 100644 --- a/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.connector.def +++ b/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.connector.def @@ -134,3 +134,7 @@ http2Enabled bool default=true http2.streamIdleTimeout double default=600 http2.maxConcurrentStreams int default=4096 + +# Override the default server name when authority is missing from request. +serverName.fallback string default="" + |