Skip to content

Commit fdaceeb

Browse files
committed
Remove checks and updates to transfer-encoding
Issue: SPR-17393
1 parent 2c5a1af commit fdaceeb

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public Mono<Void> write(Publisher<? extends T> inputStream, ResolvableType eleme
118118

119119
if (inputStream instanceof Mono) {
120120
HttpHeaders headers = message.getHeaders();
121-
if (headers.getContentLength() < 0 && !headers.containsKey(HttpHeaders.TRANSFER_ENCODING)) {
121+
if (headers.getFirst(HttpHeaders.CONTENT_LENGTH) == null) {
122122
return Mono.from(body)
123123
.defaultIfEmpty(message.bufferFactory().wrap(new byte[0]))
124124
.flatMap(buffer -> {

spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import java.nio.file.Path;
2020

2121
import io.netty.buffer.ByteBuf;
22-
import io.netty.handler.codec.http.HttpHeaderNames;
2322
import io.netty.handler.codec.http.HttpResponseStatus;
2423
import io.netty.handler.codec.http.cookie.Cookie;
2524
import io.netty.handler.codec.http.cookie.DefaultCookie;
@@ -49,16 +48,11 @@ class ReactorServerHttpResponse extends AbstractServerHttpResponse implements Ze
4948

5049

5150
public ReactorServerHttpResponse(HttpServerResponse response, DataBufferFactory bufferFactory) {
52-
super(bufferFactory, initHeaders(response));
51+
super(bufferFactory, new HttpHeaders(new NettyHeadersAdapter(response.responseHeaders())));
5352
Assert.notNull(response, "HttpServerResponse must not be null");
5453
this.response = response;
5554
}
5655

57-
private static HttpHeaders initHeaders(HttpServerResponse channel) {
58-
channel.responseHeaders().remove(HttpHeaderNames.TRANSFER_ENCODING);
59-
NettyHeadersAdapter headersMap = new NettyHeadersAdapter(channel.responseHeaders());
60-
return new HttpHeaders(headersMap);
61-
}
6256

6357
@SuppressWarnings("unchecked")
6458
@Override
@@ -87,9 +81,6 @@ protected Mono<Void> writeAndFlushWithInternal(Publisher<? extends Publisher<? e
8781

8882
@Override
8983
protected void applyHeaders() {
90-
if (getHeaders().getContentLength() == -1) {
91-
this.response.chunkedTransfer(true);
92-
}
9384
}
9485

9586
@Override

0 commit comments

Comments
 (0)