From 138e7a0e077da9dba78c76d001643947566cbfc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= Date: Mon, 4 Mar 2024 15:32:32 +0100 Subject: [PATCH] Use ServletResponse#getContentType in ServletServerHttpResponse This commit updates ServletServerHttpResponse.ServletResponseHttpHeaders in order to use ServletResponse#getContentType instead of ServletResponse#getHeader. It allows to have a consistent behavior between Tomcat (which sets only the former) and Undertow/Jetty (which set both). Closes gh-32339 --- .../springframework/http/server/ServletServerHttpResponse.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpResponse.java b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpResponse.java index 875e5bd3127..1ba11b10f76 100644 --- a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpResponse.java +++ b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpResponse.java @@ -162,7 +162,7 @@ public class ServletServerHttpResponse implements ServerHttpResponse { if (headerName.equalsIgnoreCase(CONTENT_TYPE)) { // Content-Type is written as an override so check super first String value = super.getFirst(headerName); - return (value != null ? value : servletResponse.getHeader(headerName)); + return (value != null ? value : servletResponse.getContentType()); } else { String value = servletResponse.getHeader(headerName);