Merge #3792 into 1.2.7

Signed-off-by: Violeta Georgieva <[email protected]>

Author: violetagg

reactor-netty-http/src/main/java/reactor/netty/http/client/Http2WebsocketClientOperations.java

@@ -159,12 +159,12 @@ void initHandshaker(URI currentURI, WebsocketClientSpec websocketClientSpec) {
 			PerMessageDeflateClientExtensionHandshaker perMessageDeflateClientExtensionHandshaker =
 					new PerMessageDeflateClientExtensionHandshaker(6, ZlibCodecFactory.isSupportingWindowSizeAndMemLevel(),
 							MAX_WINDOW_SIZE, websocketClientSpec.compressionAllowClientNoContext(),
-							websocketClientSpec.compressionRequestedServerNoContext());
+							websocketClientSpec.compressionRequestedServerNoContext(), 0);
 			addHandlerFirst(NettyPipeline.WsCompressionHandler,
 					new WebsocketClientExtensionHandler(Arrays.asList(
 							perMessageDeflateClientExtensionHandshaker,
-							new DeflateFrameClientExtensionHandshaker(false),
-							new DeflateFrameClientExtensionHandshaker(true))));
+							new DeflateFrameClientExtensionHandshaker(6, false, 0),
+							new DeflateFrameClientExtensionHandshaker(6, true, 0))));
 		}
 
 		String subProtocols = websocketClientSpec.protocols();

reactor-netty-http/src/main/java/reactor/netty/http/client/Http3Codec.java

@@ -87,7 +87,7 @@ protected void initChannel(QuicStreamChannel ch) {
 		        .addLast(NettyPipeline.HttpTrafficHandler, HTTP_3_STREAM_BRIDGE_CLIENT_HANDLER);
 
 		if (acceptGzip) {
-			pipeline.addLast(NettyPipeline.HttpDecompressor, new HttpContentDecompressor());
+			pipeline.addLast(NettyPipeline.HttpDecompressor, new HttpContentDecompressor(false, 0));
 		}
 
 		ChannelOperations.addReactiveBridge(ch, opsFactory, obs);

reactor-netty-http/src/main/java/reactor/netty/http/client/HttpClientConfig.java

@@ -613,7 +613,7 @@ static void addStreamHandlers(
 				.addLast(NettyPipeline.HttpTrafficHandler, HTTP_2_STREAM_BRIDGE_CLIENT_HANDLER);
 
 		if (acceptGzip) {
-			pipeline.addLast(NettyPipeline.HttpDecompressor, new HttpContentDecompressor());
+			pipeline.addLast(NettyPipeline.HttpDecompressor, new HttpContentDecompressor(false, 0));
 		}
 
 		ChannelOperations.addReactiveBridge(ch, opsFactory, obs);

reactor-netty-http/src/main/java/reactor/netty/http/client/WebsocketClientOperations.java

@@ -94,12 +94,12 @@ void initHandshaker(URI currentURI, WebsocketClientSpec websocketClientSpec) {
 			PerMessageDeflateClientExtensionHandshaker perMessageDeflateClientExtensionHandshaker =
 					new PerMessageDeflateClientExtensionHandshaker(6, ZlibCodecFactory.isSupportingWindowSizeAndMemLevel(),
 							MAX_WINDOW_SIZE, websocketClientSpec.compressionAllowClientNoContext(),
-							websocketClientSpec.compressionRequestedServerNoContext());
+							websocketClientSpec.compressionRequestedServerNoContext(), 0);
 			addHandlerFirst(NettyPipeline.WsCompressionHandler,
 					new WebSocketClientExtensionHandler(
 							perMessageDeflateClientExtensionHandshaker,
-							new DeflateFrameClientExtensionHandshaker(false),
-							new DeflateFrameClientExtensionHandshaker(true)));
+							new DeflateFrameClientExtensionHandshaker(6, false, 0),
+							new DeflateFrameClientExtensionHandshaker(6, true, 0)));
 		}
 
 		String subprotocols = websocketClientSpec.protocols();

reactor-netty-http/src/main/java/reactor/netty/http/server/Http2WebsocketServerOperations.java

@@ -82,6 +82,7 @@
 import static io.netty.handler.codec.http.HttpMethod.CONNECT;
 import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
 import static io.netty.handler.codec.http.LastHttpContent.EMPTY_LAST_CONTENT;
+import static io.netty.handler.codec.http.websocketx.extensions.compression.DeflateFrameServerExtensionHandshaker.DEFAULT_COMPRESSION_LEVEL;
 import static io.netty.handler.codec.http.websocketx.extensions.compression.PerMessageDeflateServerExtensionHandshaker.MAX_WINDOW_SIZE;
 import static reactor.netty.NettyPipeline.LEFT;
 import static reactor.netty.ReactorNetty.format;
@@ -133,11 +134,11 @@ void initHandshaker(String wsUrl, WebsocketServerSpec websocketServerSpec, HttpS
 				PerMessageDeflateServerExtensionHandshaker perMessageDeflateServerExtensionHandshaker =
 						new PerMessageDeflateServerExtensionHandshaker(6, ZlibCodecFactory.isSupportingWindowSizeAndMemLevel(),
 								MAX_WINDOW_SIZE, websocketServerSpec.compressionAllowServerNoContext(),
-								websocketServerSpec.compressionPreferredClientNoContext());
+								websocketServerSpec.compressionPreferredClientNoContext(), 0);
 				WebsocketServerExtensionHandler wsServerExtensionHandler =
 						new WebsocketServerExtensionHandler(Arrays.asList(
 								perMessageDeflateServerExtensionHandshaker,
-								new DeflateFrameServerExtensionHandshaker()));
+								new DeflateFrameServerExtensionHandshaker(DEFAULT_COMPRESSION_LEVEL, 0)));
 				try {
 					ChannelPipeline pipeline = channel.pipeline();
 					wsServerExtensionHandler.channelRead(pipeline.context(NettyPipeline.ReactiveBridge), request);

reactor-netty-http/src/main/java/reactor/netty/http/server/WebsocketServerOperations.java

@@ -56,6 +56,7 @@
 import reactor.util.context.Context;
 import reactor.util.context.ContextView;
 
+import static io.netty.handler.codec.http.websocketx.extensions.compression.DeflateFrameServerExtensionHandshaker.DEFAULT_COMPRESSION_LEVEL;
 import static io.netty.handler.codec.http.websocketx.extensions.compression.PerMessageDeflateServerExtensionHandshaker.MAX_WINDOW_SIZE;
 import static reactor.netty.ReactorNetty.format;
 
@@ -121,11 +122,11 @@ void initHandshaker(String wsUrl, WebsocketServerSpec websocketServerSpec, HttpS
 				PerMessageDeflateServerExtensionHandshaker perMessageDeflateServerExtensionHandshaker =
 						new PerMessageDeflateServerExtensionHandshaker(6, ZlibCodecFactory.isSupportingWindowSizeAndMemLevel(),
 								MAX_WINDOW_SIZE, websocketServerSpec.compressionAllowServerNoContext(),
-								websocketServerSpec.compressionPreferredClientNoContext());
+								websocketServerSpec.compressionPreferredClientNoContext(), 0);
 				WebSocketServerExtensionHandler wsServerExtensionHandler =
 						new WebSocketServerExtensionHandler(
 								perMessageDeflateServerExtensionHandshaker,
-								new DeflateFrameServerExtensionHandshaker());
+								new DeflateFrameServerExtensionHandshaker(DEFAULT_COMPRESSION_LEVEL, 0));
 				try {
 					ChannelPipeline pipeline = channel.pipeline();
 					wsServerExtensionHandler.channelRead(pipeline.context(NettyPipeline.ReactiveBridge), request);

reactor-netty-http/src/test/java/reactor/netty/http/client/HttpClientTest.java

@@ -476,7 +476,7 @@ void gzip() {
 				        .headers(h -> h.add("Accept-Encoding", "gzip")
 				                       .add("Accept-Encoding", "deflate"))
 				        .doOnRequest((req, conn) ->
-				                conn.addHandlerFirst("gzipDecompressor", new HttpContentDecompressor()))
+				                conn.addHandlerFirst("gzipDecompressor", new HttpContentDecompressor(false, 0)))
 				        .get()
 				        .response((r, buf) -> buf.aggregate()
 				                                 .asString()

reactor-netty-http/src/test/java/reactor/netty/http/server/HttpServerTests.java

@@ -1157,7 +1157,7 @@ private void doTestDropData(
 	void testIssue525() {
 		disposableServer =
 				createServer()
-				          .doOnConnection(c -> c.addHandlerFirst("decompressor", new HttpContentDecompressor()))
+				          .doOnConnection(c -> c.addHandlerFirst("decompressor", new HttpContentDecompressor(false, 0)))
 				          .handle((req, res) -> res.send(req.receive()
 				                                            .retain()))
 				          .bindNow(Duration.ofSeconds(30));