Always call onInboundComplete in case of HTTP/1.1 and TLS upgrade flow

Signed-off-by: Andriy Redko <[email protected]>
reactor · Dec 16, 2024 · b3060a3 · b3060a3
1 parent d33486c
commit b3060a3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/reactor-netty-http/src/main/java/reactor/netty/http/server/HttpServerOperations.java b/reactor-netty-http/src/main/java/reactor/netty/http/server/HttpServerOperations.java
@@ -814,12 +814,6 @@ else if (msg instanceof HttpRequest) {
 				}
 				else {
 					request.release();
-					// HTTP/1.1 TLS Upgrade (RFC-2817) on empty requests (GET/HEAD/OPTIONS)
-					if (!isHttp2() && request.headers().contains(HttpHeaderNames.UPGRADE)) {
-						//force auto read to enable more accurate close selection now inbound is done
-						channel().config().setAutoRead(true);
-						onInboundComplete();
-					}
 				}
 				if (isHttp2()) {
 					//force auto read to enable more accurate close selection now inbound is done
@@ -828,9 +822,10 @@ else if (msg instanceof HttpRequest) {
 				}
 				else if (!isHttp2() && request.headers().contains(HttpHeaderNames.UPGRADE)) {
 					// HTTP/1.1 TLS Upgrade (RFC-2817) requests (GET/HEAD/OPTIONS) with empty / non-empty payload
-					// No need to call onInboundComplete(), it will be triggered by onInboundNext(...)
-					// since this is the last HTTP content
 					stopReadTimeout();
+					//force auto read to enable more accurate close selection now inbound is done
+					channel().config().setAutoRead(true);
+					onInboundComplete();
 				}
 			}
 		}

diff --git a/reactor-netty-http/src/test/java/reactor/netty/http/client/HttpClientTest.java b/reactor-netty-http/src/test/java/reactor/netty/http/client/HttpClientTest.java
@@ -3641,6 +3641,5 @@ public void accept(HttpContent message) {
         public void subscribe(Subscriber<? super HttpContent> s) {
             sender.subscribe(s);
         }
-
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -3641,6 +3641,5 @@ public void accept(HttpContent message) { @@
             public void subscribe(Subscriber<? super HttpContent> s) {
                 sender.subscribe(s);
             }
         }
     }