Skip to content

Commit 071f344

Browse files
author
Corneil du Plessis
authored
Update transformLocation to not append port when serverName has : after @. (#1422)
Fixes #1420
1 parent 5d70750 commit 071f344

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

spring-ws-core/src/main/java/org/springframework/ws/transport/http/LocationTransformerObjectSupport.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,11 @@ protected String transformLocation(String location, HttpServletRequest request)
9797
int serverPort = StringUtils.hasText(xForwardedPort) ? Integer.parseInt(xForwardedPort) : request.getServerPort();
9898

9999
StringBuilder url = new StringBuilder(scheme);
100-
url.append("://").append(serverName).append(':').append(serverPort);
100+
url.append("://").append(serverName);
101+
boolean serverHasColonAfterAt = serverName.indexOf("@") < serverName.indexOf(":");
102+
if(!serverHasColonAfterAt) {
103+
url.append(':').append(serverPort);
104+
}
101105
if (location.startsWith("/")) {
102106
// a relative path, prepend the context path
103107
url.append(request.getContextPath()).append(location);

0 commit comments

Comments
 (0)