Merge #3549 into 2.0.0-M4

reactor · Dec 17, 2024 · b6abd0d · b6abd0d
2 parents 2d21d25 + ada11e0
commit b6abd0d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/reactor-netty5-http/src/main/java/reactor/netty5/http/client/HttpClientConnect.java b/reactor-netty5-http/src/main/java/reactor/netty5/http/client/HttpClientConnect.java
@@ -501,8 +501,9 @@ Publisher<Void> requestWithBody(HttpClientOperations ch) {
 				ch.followRedirectPredicate(followRedirectPredicate);
 
 				if (!Objects.equals(method, HttpMethod.GET) &&
-							!Objects.equals(method, HttpMethod.HEAD) &&
-							!headers.contains(HttpHeaderNames.CONTENT_LENGTH)) {
+						!Objects.equals(method, HttpMethod.HEAD) &&
+						!Objects.equals(method, HttpMethod.DELETE) &&
+						!headers.contains(HttpHeaderNames.CONTENT_LENGTH)) {
 					ch.chunkedTransfer(true);
 				}
 

diff --git a/reactor-netty5-http/src/main/java/reactor/netty5/http/client/HttpClientOperations.java b/reactor-netty5-http/src/main/java/reactor/netty5/http/client/HttpClientOperations.java
@@ -421,7 +421,9 @@ public NettyOutbound send(Publisher<? extends Buffer> source) {
 		if (source instanceof Mono) {
 			return super.send(source);
 		}
-		if (Objects.equals(method(), HttpMethod.GET) || Objects.equals(method(), HttpMethod.HEAD)) {
+		if (Objects.equals(method(), HttpMethod.GET) ||
+				Objects.equals(method(), HttpMethod.HEAD) ||
+				Objects.equals(method(), HttpMethod.DELETE)) {
 
 			return new PostHeadersNettyOutbound(Flux.from(source)
 			                .collectList()
@@ -454,7 +456,7 @@ public NettyOutbound send(Publisher<? extends Buffer> source) {
 				                }
 				                for (Buffer bb : list) {
 				                	if (log.isDebugEnabled()) {
-				                		log.debug(format(channel(), "Ignoring accumulated buffer on http GET {}"), bb);
+				                		log.debug(format(channel(), "Ignoring accumulated buffer on http {} {}"), method(), bb);
 					                }
 				                	bb.close();
 				                }

diff --git a/reactor-netty5-http/src/test/java/reactor/netty5/http/client/HttpClientTest.java b/reactor-netty5-http/src/test/java/reactor/netty5/http/client/HttpClientTest.java
@@ -3515,24 +3515,26 @@ void testIssue3416() {
 	}
 
 	@ParameterizedTest
-	@ValueSource(booleans = {true, false})
-	void testDeleteMethod(boolean chunked) {
+	@ValueSource(strings = {"mono", "flux", "empty"})
+	void testDeleteMethod(String requestBodyType) {
 		disposableServer =
 				createServer()
-				        .handle((req, res) -> res.send(req.receive().transferOwnership()))
+				        .handle((req, res) -> res.sendString(
+				            Flux.concat(req.receive().aggregate().asString().defaultIfEmpty("empty"),
+				                        Mono.just(" " + req.requestHeaders().get(HttpHeaderNames.CONTENT_LENGTH)))))
 				        .bindNow();
 
-		Publisher<Buffer> body = chunked ?
+		Publisher<Buffer> body = "flux".equals(requestBodyType) ?
 				BufferFlux.fromString(Flux.just("d", "e", "l", "e", "t", "e")) :
-				BufferMono.fromString(Mono.just("delete"));
+				"mono".equals(requestBodyType) ? BufferMono.fromString(Mono.just("delete")) : Mono.empty();
 
 		createClient(disposableServer.port())
 		        .delete()
 		        .uri("/")
 		        .send(body)
 		        .responseSingle((res, bytes) -> bytes.asString())
 		        .as(StepVerifier::create)
-		        .expectNext("delete")
+		        .expectNext("empty".equals(requestBodyType) ? "empty 0" : "delete 6")
 		        .expectComplete()
 		        .verify(Duration.ofSeconds(5));
 	}