spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-17 16:39:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '7.0.x'

Browse Source
This commit is contained in:
rstoyanchev
2026-07-29 15:18:45 +03:00
parent 91c6851f29 719311f09b
commit 56f7cc2dab
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java
+2 -2
View File
@@ -128,7 +128,7 @@ public class ForwardedHeaderFilter extends OncePerRequestFilter {
* <p>"X-Forwarded-Prefix" is enabled separately via {@link #setUseForwardedPrefix}.
* @param useStandardHeader whether to use the standard "Forwarded" header
* (true), or the "X-Forwarded-*" alternative headers (false).
* @since 7.0.9
* @since 6.1.29
*/
public ForwardedHeaderFilter(boolean useStandardHeader) {
this.useStandardHeader = useStandardHeader;
@@ -138,7 +138,7 @@ public class ForwardedHeaderFilter extends OncePerRequestFilter {
/**
* Enable use of "X-Forwarded-Prefix" to determine the context path.
* <p>By default, this is set to "false" in which case the header is ignored.
* @since 7.1
* @since 6.1.29
*/
public void setUseForwardedPrefix(boolean useForwardedPrefix) {
this.useForwardedPrefix = useForwardedPrefix;
spring-web/src/main/java/org/springframework/web/server/adapter/ForwardedHeaderTransformer.java
+2 -2
View File
@@ -112,7 +112,7 @@ public class ForwardedHeaderTransformer implements Function<ServerHttpRequest, S
* <p>"X-Forwarded-Prefix" is enabled separately via {@link #setUseForwardedPrefix}.
* @param useStandardHeader whether to use the standard "Forwarded" header
* (true), or the "X-Forwarded-*" alternative headers (false).
* @since 7.0.9
* @since 6.1.29
*/
public ForwardedHeaderTransformer(boolean useStandardHeader) {
this.useStandardHeader = useStandardHeader;
@@ -122,7 +122,7 @@ public class ForwardedHeaderTransformer implements Function<ServerHttpRequest, S
/**
* Enable use of "X-Forwarded-Prefix" to determine the context path.
* <p>By default, this is set to "false" in which case the header is ignored.
* @since 7.1
* @since 6.1.29
*/
public void setUseForwardedPrefix(boolean useForwardedPrefix) {
this.useForwardedPrefix = useForwardedPrefix;
spring-web/src/main/java/org/springframework/web/util/ForwardedHeaderUtils.java
+3 -3
View File
@@ -68,7 +68,7 @@ public abstract class ForwardedHeaderUtils {
* @param remoteAddress for a default port for the parsed "for" value
* @param localAddress for a default port for the parsed "by" value
* @return a {@link ForwardedInfo} with the parse results
* @since 7.0.9
* @since 6.1.29
* @see <a href="https://tools.ietf.org/html/rfc7239">RFC 7239</a>
*/
public static ForwardedInfo parseStandardHeader(URI uri, HttpHeaders headers,
@@ -252,7 +252,7 @@ public abstract class ForwardedHeaderUtils {
* this argument is ignored currently and the byAddress is always {@code null}
* @return a {@link ForwardedInfo} with the scheme, host, and port adapted
* from the "X-Forwarded-*" headers, and the parsed "for" address
* @since 7.0.9
* @since 6.1.29
*/
public static ForwardedInfo parseXForwardedHeaders(URI uri, HttpHeaders headers,
@Nullable InetSocketAddress remoteAddress, @Nullable InetSocketAddress localAddress) {
@@ -437,7 +437,7 @@ public abstract class ForwardedHeaderUtils {
/**
* Container for the combined results of parsing either the "Forwarded"
* header or the "X-Forwarded-*" alternative headers.
* @since 7.1
* @since 6.1.29
* @param uriComponentsBuilder the request URI adapted with the scheme, host,
* and port from forwarded header values
* @param forAddress the address parsed from the "Forwarded" header "for" or