Use HOST request header for base url in model evaluation REST API

1 files changed, 8 insertions, 3 deletions

diff --git a/model-evaluation/src/main/java/ai/vespa/models/handler/ModelsEvaluationHandler.java b/model-evaluation/src/main/java/ai/vespa/models/handler/ModelsEvaluationHandler.java
index de23a8c6526..a0744128a11 100644
--- a/model-evaluation/src/main/java/ai/vespa/models/handler/ModelsEvaluationHandler.java
+++ b/model-evaluation/src/main/java/ai/vespa/models/handler/ModelsEvaluationHandler.java
@@ -140,9 +140,14 @@ public class ModelsEvaluationHandler extends ThreadedHttpRequestHandler {
     private String baseUrl(HttpRequest request) {
        URI uri = request.getUri();
        StringBuilder sb = new StringBuilder();
-       sb.append(uri.getScheme()).append("://").append(uri.getHost());
-       if (uri.getPort() >= 0) {
-           sb.append(":").append(uri.getPort());
+       sb.append(uri.getScheme()).append("://");
+       if (request.getHeader("Host") != null) {
+           sb.append(request.getHeader("Host"));
+       } else {
+           sb.append(uri.getHost());
+           if (uri.getPort() >= 0) {
+               sb.append(":").append(uri.getPort());
+           }
        }
        sb.append("/").append(API_ROOT).append("/").append(VERSION_V1).append("/");
        return sb.toString();