Support comma-separated X-Forwarded-Proto

Issue: SPR-12816
2015-03-13 13:02:52 -04:00
parent c6250f5164
commit 69b3e00215
2 changed files with 21 additions and 1 deletions
--- a/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
@@ -303,7 +303,8 @@ public class UriComponentsBuilder implements Cloneable {

 		String protocolHeader = request.getHeaders().getFirst("X-Forwarded-Proto");
 		if (StringUtils.hasText(protocolHeader)) {
-			scheme = protocolHeader;
+			String[] protocols = StringUtils.commaDelimitedListToStringArray(protocolHeader);
+			scheme = protocols[0];
 		}

 		builder.scheme(scheme);