Merge branch '6.2.x'

spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java

@@ -681,7 +681,12 @@ public class MockHttpServletResponse implements HttpServletResponse {
 
 	@Override
 	public void setHeader(String name, @Nullable String value) {
-		setHeaderValue(name, value);
+		if (value == null) {
+			this.headers.remove(name);
+		}
+		else {
+			setHeaderValue(name, value);
+		}
 	}
 
 	@Override

spring-test/src/test/java/org/springframework/mock/web/MockHttpServletResponseTests.java

@@ -88,6 +88,18 @@ class MockHttpServletResponseTests {
 		assertThat(response.containsHeader(headerName)).isFalse();
 	}
 
+	@ParameterizedTest
+	@ValueSource(strings = {
+			CONTENT_TYPE,
+			CONTENT_LANGUAGE,
+			"X-Test-Header"
+	})
+	void removeHeaderIfNullValue(String headerName) {
+		response.addHeader(headerName, "test");
+		response.setHeader(headerName, null);
+		assertThat(response.containsHeader(headerName)).isFalse();
+	}
+
 	@Test  // gh-26493
 	void setLocaleWithNullValue() {
 		assertThat(response.getLocale()).isEqualTo(Locale.getDefault());