Merge branch '6.3.x' into 6.4.x

jzheaux · jzheaux · commit 2989d12743ee · 2025-05-23T11:35:25.000-06:00
diff --git a/web/src/main/java/org/springframework/security/web/header/writers/ClearSiteDataHeaderWriter.java b/web/src/main/java/org/springframework/security/web/header/writers/ClearSiteDataHeaderWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -75,6 +75,7 @@ public void writeHeaders(HttpServletRequest request, HttpServletResponse respons
 			if (!response.containsHeader(CLEAR_SITE_DATA_HEADER)) {
 				response.setHeader(CLEAR_SITE_DATA_HEADER, this.headerValue);
 			}
+			return;
 		}
 		this.logger.debug(
 				LogMessage.format("Not injecting Clear-Site-Data header since it did not match the requestMatcher %s",

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2019 the original author or authors.`
	`2`	`+ * Copyright 2002-2025 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -75,6 +75,7 @@ public void writeHeaders(HttpServletRequest request, HttpServletResponse respons`
`75`	`75`	`if (!response.containsHeader(CLEAR_SITE_DATA_HEADER)) {`
`76`	`76`	`response.setHeader(CLEAR_SITE_DATA_HEADER, this.headerValue);`
`77`	`77`	`}`
	`78`	`+ return;`
`78`	`79`	`}`
`79`	`80`	`this.logger.debug(`
`80`	`81`	`LogMessage.format("Not injecting Clear-Site-Data header since it did not match the requestMatcher %s",`