ContentCachingResponseWrapper skips contentLength for chunked responses

Closes gh-26182

spring-web/src/main/java/org/springframework/web/util/ContentCachingResponseWrapper.java

@@ -27,6 +27,7 @@ import javax.servlet.WriteListener;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;
 
+import org.springframework.http.HttpHeaders;
 import org.springframework.lang.Nullable;
 import org.springframework.util.FastByteArrayOutputStream;
 
@@ -209,7 +210,9 @@ public class ContentCachingResponseWrapper extends HttpServletResponseWrapper {
 		if (this.content.size() > 0) {
 			HttpServletResponse rawResponse = (HttpServletResponse) getResponse();
 			if ((complete || this.contentLength != null) && !rawResponse.isCommitted()) {
-				rawResponse.setContentLength(complete ? this.content.size() : this.contentLength);
+				if (rawResponse.getHeader(HttpHeaders.TRANSFER_ENCODING) == null) {
+					rawResponse.setContentLength(complete ? this.content.size() : this.contentLength);
+				}
 				this.contentLength = null;
 			}
 			this.content.writeTo(rawResponse.getOutputStream());

spring-web/src/test/java/org/springframework/web/filter/ContentCachingResponseWrapperTests.java

+/*
+ * Copyright 2002-2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.web.filter;
+
+import java.nio.charset.StandardCharsets;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.http.HttpHeaders;
+import org.springframework.util.FileCopyUtils;
+import org.springframework.web.testfixture.servlet.MockHttpServletResponse;
+import org.springframework.web.util.ContentCachingResponseWrapper;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Unit tests for {@link ContentCachingResponseWrapper}.
+ * @author Rossen Stoyanchev
+ */
+public class ContentCachingResponseWrapperTests {
+
+	@Test
+	void copyBodyToResponse() throws Exception {
+		byte[] responseBody = "Hello World".getBytes(StandardCharsets.UTF_8);
+		MockHttpServletResponse response = new MockHttpServletResponse();
+
+		ContentCachingResponseWrapper responseWrapper = new ContentCachingResponseWrapper(response);
+		responseWrapper.setStatus(HttpServletResponse.SC_OK);
+		FileCopyUtils.copy(responseBody, responseWrapper.getOutputStream());
+		responseWrapper.copyBodyToResponse();
+
+		assertThat(response.getStatus()).isEqualTo(200);
+		assertThat(response.getContentLength() > 0).isTrue();
+		assertThat(response.getContentAsByteArray()).isEqualTo(responseBody);
+	}
+
+	@Test
+	void copyBodyToResponseWithTransferEncoding() throws Exception {
+		byte[] responseBody = "6\r\nHello 5\r\nWorld0\r\n\r\n".getBytes(StandardCharsets.UTF_8);
+		MockHttpServletResponse response = new MockHttpServletResponse();
+
+		ContentCachingResponseWrapper responseWrapper = new ContentCachingResponseWrapper(response);
+		responseWrapper.setStatus(HttpServletResponse.SC_OK);
+		responseWrapper.setHeader(HttpHeaders.TRANSFER_ENCODING, "chunked");
+		FileCopyUtils.copy(responseBody, responseWrapper.getOutputStream());
+		responseWrapper.copyBodyToResponse();
+
+		assertThat(response.getStatus()).isEqualTo(200);
+		assertThat(response.getHeader(HttpHeaders.TRANSFER_ENCODING)).isEqualTo("chunked");
+		assertThat(response.getHeader(HttpHeaders.CONTENT_LENGTH)).isNull();
+		assertThat(response.getContentAsByteArray()).isEqualTo(responseBody);
+	}
+
+}