Merge branch '6.2.x'

Author: bclozel

spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java

@@ -573,6 +573,7 @@ public void handleRequest(HttpServletRequest request, HttpServletResponse respon
 						HttpRange.toResourceRegions(httpRanges, resource), mediaType, outputMessage);
 			}
 			catch (IllegalArgumentException ex) {
+				response.setContentType(null);
 				response.setHeader(HttpHeaders.CONTENT_RANGE, "bytes */" + resource.contentLength());
 				response.sendError(HttpServletResponse.SC_REQUESTED_RANGE_NOT_SATISFIABLE);
 			}

spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java

@@ -30,6 +30,7 @@
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.UrlResource;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 import org.springframework.util.StringUtils;
@@ -319,6 +320,7 @@ void partialContentInvalidRangeHeader() throws Exception {
 			this.handler.handleRequest(this.request, this.response);
 
 			assertThat(this.response.getStatus()).isEqualTo(416);
+			assertThat(this.response.getHeaderNames()).doesNotContain(HttpHeaders.CONTENT_TYPE);
 			assertThat(this.response.getHeader("Content-Range")).isEqualTo("bytes */10");
 			assertThat(this.response.getHeader("Accept-Ranges")).isEqualTo("bytes");
 			assertThat(this.response.getHeaders("Accept-Ranges")).hasSize(1);