Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Set content length on ServletHttpResponse

Browse Source 
Prior to this commit, the `ServletServerHttpResponse` would copy headers
from the `HttpHeaders` map and calls methods related to headers exposed
as properties (content-type, character encoding).

Unlike its reactive variant, this would not set the content length.
Depending on the Servlet container implementation, this could cause
duplicate Content-Length response headers in the actual HTTP response.

This commit aligns both implementations and ensures that the
`setContentLengthLong` method is called if necessary so that the Servlet
container can ensure a single header for that.

Fixes gh-26330
This commit is contained in:
Brian Clozel
2021-01-06 20:34:25 +01:00
parent efa360cff7
commit dcc8dcdff8
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-web/src/main/java/org/springframework/http/server/ServletServerHttpResponse.java
View File

@@ -125,6 +125,10 @@ public class ServletServerHttpResponse implements ServerHttpResponse {
this.headers.getContentType().getCharset() != null) { this.headers.getContentType().getCharset() != null) {
this.servletResponse.setCharacterEncoding(this.headers.getContentType().getCharset().name()); this.servletResponse.setCharacterEncoding(this.headers.getContentType().getCharset().name());
} }
long contentLength = getHeaders().getContentLength();
if (contentLength != -1) {
this.servletResponse.setContentLengthLong(contentLength);
}
this.headersWritten = true; this.headersWritten = true;
} }
} }