diff --git a/spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java b/spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java index cf5b39cac3..0af5bb3670 100644 --- a/spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java +++ b/spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java @@ -65,7 +65,7 @@ import org.springframework.web.util.UrlPathHelper; public class ForwardedHeaderFilter extends OncePerRequestFilter { private static final Set FORWARDED_HEADER_NAMES = - Collections.newSetFromMap(new LinkedCaseInsensitiveMap<>(5, Locale.ENGLISH)); + Collections.newSetFromMap(new LinkedCaseInsensitiveMap<>(6, Locale.ENGLISH)); static { FORWARDED_HEADER_NAMES.add("Forwarded"); diff --git a/spring-web/src/main/java/org/springframework/web/server/adapter/ForwardedHeaderTransformer.java b/spring-web/src/main/java/org/springframework/web/server/adapter/ForwardedHeaderTransformer.java index 174545ecd4..77227e5cb2 100644 --- a/spring-web/src/main/java/org/springframework/web/server/adapter/ForwardedHeaderTransformer.java +++ b/spring-web/src/main/java/org/springframework/web/server/adapter/ForwardedHeaderTransformer.java @@ -16,13 +16,16 @@ package org.springframework.web.server.adapter; import java.net.URI; +import java.util.Collections; import java.util.LinkedHashSet; +import java.util.Locale; import java.util.Set; import java.util.function.Function; import org.springframework.http.HttpHeaders; import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.lang.Nullable; +import org.springframework.util.LinkedCaseInsensitiveMap; import org.springframework.web.util.UriComponentsBuilder; /** @@ -39,7 +42,8 @@ import org.springframework.web.util.UriComponentsBuilder; */ public class ForwardedHeaderTransformer implements Function { - static final Set FORWARDED_HEADER_NAMES = new LinkedHashSet<>(5); + static final Set FORWARDED_HEADER_NAMES = + Collections.newSetFromMap(new LinkedCaseInsensitiveMap<>(6, Locale.ENGLISH)); static { FORWARDED_HEADER_NAMES.add("Forwarded");