From 5fc8a9839cb22b960d05d8e9b94d69ceb4297062 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <poutsmaa@vmware.com>
Date: Tue, 12 Apr 2022 10:36:49 +0200
Subject: [PATCH] Do not add Accept-Ranges header on client-side

This commit fixes a regression that added the Accept-Ranges header on
both client and server. Accept-Ranges is response header, so we now make
sure it only appears on the server side.

See gh-28291
---
 .../http/codec/ResourceHttpMessageWriter.java |  5 ++++-
 .../codec/ResourceHttpMessageWriterTests.java | 20 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/codec/ResourceHttpMessageWriter.java b/spring-web/src/main/java/org/springframework/http/codec/ResourceHttpMessageWriter.java
index 5765fe218c..a1ca47d5ab 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/ResourceHttpMessageWriter.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/ResourceHttpMessageWriter.java
@@ -145,7 +145,10 @@ public class ResourceHttpMessageWriter implements HttpMessageWriter<Resource> {
 				headers.setContentLength(length);
 			}
 		}
-		headers.set(HttpHeaders.ACCEPT_RANGES, "bytes");
+		if (message instanceof ServerHttpResponse) {
+			// server side
+			headers.set(HttpHeaders.ACCEPT_RANGES, "bytes");
+		}
 	}
 
 	private static MediaType getResourceMediaType(
diff --git a/spring-web/src/test/java/org/springframework/http/codec/ResourceHttpMessageWriterTests.java b/spring-web/src/test/java/org/springframework/http/codec/ResourceHttpMessageWriterTests.java
index b63e613be6..6806fe730c 100644
--- a/spring-web/src/test/java/org/springframework/http/codec/ResourceHttpMessageWriterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/codec/ResourceHttpMessageWriterTests.java
@@ -25,13 +25,16 @@ import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+import org.springframework.core.ResolvableType;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.Resource;
 import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpRange;
 import org.springframework.http.HttpStatus;
 import org.springframework.util.MimeTypeUtils;
 import org.springframework.util.StringUtils;
+import org.springframework.web.testfixture.http.client.reactive.MockClientHttpRequest;
 import org.springframework.web.testfixture.http.server.reactive.MockServerHttpRequest;
 import org.springframework.web.testfixture.http.server.reactive.MockServerHttpResponse;
 
@@ -66,7 +69,7 @@ public class ResourceHttpMessageWriterTests {
 	}
 
 	@Test
-	public void writeResource() throws Exception {
+	public void writeResourceServer() throws Exception {
 
 		testWrite(get("/").build());
 
@@ -78,6 +81,21 @@ public class ResourceHttpMessageWriterTests {
 		StepVerifier.create(this.response.getBodyAsString()).expectNext(content).expectComplete().verify();
 	}
 
+	@Test
+	public void writeResourceClient() throws Exception {
+
+		MockClientHttpRequest request = new MockClientHttpRequest(HttpMethod.GET, "/");
+		Mono<Void> mono = this.writer.write(this.input, ResolvableType.forClass(Resource.class), TEXT_PLAIN, request, HINTS);
+		StepVerifier.create(mono).expectComplete().verify();
+
+		assertThat(request.getHeaders().getContentType()).isEqualTo(TEXT_PLAIN);
+		assertThat(request.getHeaders().getContentLength()).isEqualTo(39L);
+		assertThat(request.getHeaders().getFirst(HttpHeaders.ACCEPT_RANGES)).isNull();
+
+		String content = "Spring Framework test resource content.";
+		StepVerifier.create(request.getBodyAsString()).expectNext(content).expectComplete().verify();
+	}
+
 	@Test
 	public void writeSingleRegion() throws Exception {