summaryrefslogtreecommitdiffstats
path: root/container-core
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahooinc.com>2022-10-13 10:32:12 +0200
committerBjørn Christian Seime <bjorncs@yahooinc.com>2022-10-13 10:51:12 +0200
commitb10ceeae0a947779890143bdac774b6425931cdc (patch)
treee10ad35b8a0abe54b4cfd111db17d9da0c771428 /container-core
parentfdd9b30418bfde52377a4589adfa32aa8deba0ee (diff)
Add connector suffix to all configured virtual hosts
Diffstat (limited to 'container-core')
-rw-r--r--container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java
index 2d80fabd949..37546d734f0 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java
@@ -237,7 +237,10 @@ public class JettyHttpServer extends AbstractServerProvider {
if (allowedServerNames.isEmpty()) {
ctxHandler.setVirtualHosts(new String[]{"@%s".formatted(connector.getName())});
} else {
- ctxHandler.setVirtualHosts(allowedServerNames.toArray(new String[0]));
+ String[] virtualHosts = allowedServerNames.stream()
+ .map(name -> "%s@%s".formatted(name, connector.getName()))
+ .toArray(String[]::new);
+ ctxHandler.setVirtualHosts(virtualHosts);
}
return ctxHandler;
}