From f8fa40fe3097959406fffd501834a8f0e0e022e2 Mon Sep 17 00:00:00 2001 From: Will Price Date: Fri, 29 Sep 2017 11:59:20 +0200 Subject: [PATCH] Fixed getBaseUrl to return just the base URL, not the full URL - this fixes a lot of issue with getFullUrl (which uses getBaseURL) see issue #80 --- .../java/com/sdl/webapp/common/impl/WebRequestContextImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/WebRequestContextImpl.java b/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/WebRequestContextImpl.java index ccd6f4aae..871f675eb 100644 --- a/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/WebRequestContextImpl.java +++ b/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/WebRequestContextImpl.java @@ -303,6 +303,7 @@ public void popParentRegion() { private String baseUrl() { String baseUrl = servletRequest.getRequestURL().toString(); + baseUrl = baseUrl.substring(0, baseUrl.length() - servletRequest.getRequestURI().length()); if (baseUrl.endsWith("/")) { baseUrl = baseUrl.substring(0, baseUrl.length() - 1); }