From efa360cff76655dafe1aabb88523dbe5ffa49584 Mon Sep 17 00:00:00 2001
From: Paul Warren <warrenpa@vmware.com>
Date: Mon, 4 Jan 2021 13:27:37 -0800
Subject: [PATCH] Avoid writing content-length twice in resource handling

Prior to this commit, the `ResourceHttpRequestHandler` would write the
resource size to the "Content-Length" response header.
This is already done by the underlying `ResourceHttpMessageConverter`
and `ResourceRegionHttpMessageConverter`.

This commit avoid this duplicate operation and delegates instead to the
converters.

See gh-26330
Closes gh-26340
---
 .../web/servlet/resource/ResourceHttpRequestHandler.java  | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
index 03d5ca02502..9408527f7ad 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
@@ -759,14 +759,6 @@ public class ResourceHttpRequestHandler extends WebContentGenerator
 	protected void setHeaders(HttpServletResponse response, Resource resource, @Nullable MediaType mediaType)
 			throws IOException {
 
-		long length = resource.contentLength();
-		if (length > Integer.MAX_VALUE) {
-			response.setContentLengthLong(length);
-		}
-		else {
-			response.setContentLength((int) length);
-		}
-
 		if (mediaType != null) {
 			response.setContentType(mediaType.toString());
 		}