1 files changed, 2 insertions, 12 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 37546d734f0..775c903f5f8 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
@@ -231,18 +231,8 @@ public class JettyHttpServer extends AbstractServerProvider {
         return h;
     }
 
-    private static ContextHandler newConnectorContextHandler(JDiscServerConnector connector) {
-        ContextHandler ctxHandler = new ContextHandler();
-        List<String> allowedServerNames = connector.connectorConfig().serverName().allowed();
-        if (allowedServerNames.isEmpty()) {
-            ctxHandler.setVirtualHosts(new String[]{"@%s".formatted(connector.getName())});
-        } else {
-            String[] virtualHosts = allowedServerNames.stream()
-                    .map(name -> "%s@%s".formatted(name, connector.getName()))
-                    .toArray(String[]::new);
-            ctxHandler.setVirtualHosts(virtualHosts);
-        }
-        return ctxHandler;
+    private static ContextHandler newConnectorContextHandler(JDiscServerConnector c) {
+        return new ConnectorSpecificContextHandler(c);
     }
 
     private static HealthCheckProxyHandler newHealthCheckProxyHandler(List<JDiscServerConnector> connectors) {