Merge branch '5.2.x'

Author: sbrannen

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

@@ -331,6 +331,7 @@ public boolean isCommitted() {
 	public void reset() {
 		resetBuffer();
 		this.characterEncoding = null;
+		this.charset = false;
 		this.contentLength = 0;
 		this.contentType = null;
 		this.locale = Locale.getDefault();

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

@@ -481,4 +481,27 @@ private void assertPrimarySessionCookie(String expectedValue) {
 		assertThat(((MockCookie) cookie).getSameSite()).isEqualTo("Lax");
 	}
 
+	@Test  // gh-25501
+	void resetResetsCharset() {
+		assertThat(response.isCharset()).isFalse();
+		response.setCharacterEncoding("UTF-8");
+		assertThat(response.isCharset()).isTrue();
+		assertThat(response.getCharacterEncoding()).isEqualTo("UTF-8");
+		response.setContentType("text/plain");
+		assertThat(response.getContentType()).isEqualTo("text/plain");
+		String contentTypeHeader = response.getHeader(CONTENT_TYPE);
+		assertThat(contentTypeHeader).isEqualTo("text/plain;charset=UTF-8");
+
+		response.reset();
+
+		assertThat(response.isCharset()).isFalse();
+		// Do not invoke setCharacterEncoding() since that sets the charset flag to true.
+		// response.setCharacterEncoding("UTF-8");
+		response.setContentType("text/plain");
+		assertThat(response.isCharset()).isFalse(); // should still be false
+		assertThat(response.getContentType()).isEqualTo("text/plain");
+		contentTypeHeader = response.getHeader(CONTENT_TYPE);
+		assertThat(contentTypeHeader).isEqualTo("text/plain");
+	}
+
 }

spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java

@@ -331,6 +331,7 @@ public boolean isCommitted() {
 	public void reset() {
 		resetBuffer();
 		this.characterEncoding = null;
+		this.charset = false;
 		this.contentLength = 0;
 		this.contentType = null;
 		this.locale = Locale.getDefault();