From 96008932eb4e84a18f26df38564115acc1d679d5 Mon Sep 17 00:00:00 2001 From: Steven Schlansker Date: Fri, 27 Oct 2017 12:58:46 -0700 Subject: [PATCH] MockHttpServletRequest: use computed serverName, otherwise it's easy to accidentally get 'localhost' --- .../org/springframework/mock/web/MockHttpServletRequest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java index 4a6d50d7f842..279b9ab8e100 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java +++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java @@ -1199,7 +1199,7 @@ public String getRequestURI() { @Override public StringBuffer getRequestURL() { - StringBuffer url = new StringBuffer(this.scheme).append("://").append(this.serverName); + StringBuffer url = new StringBuffer(this.scheme).append("://").append(getServerName()); if (this.serverPort > 0 && ((HTTP.equalsIgnoreCase(this.scheme) && this.serverPort != 80) || (HTTPS.equalsIgnoreCase(this.scheme) && this.serverPort != 443))) { url.append(':').append(this.serverPort);