Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ class VertxHttp2ConnectionHandler<C extends Http2ConnectionBase> extends Http2Co
private final boolean useDecompressor;
private final Http2Settings initialSettings;
public boolean upgraded;
private final Http2LocalFlowController defaultController;

public VertxHttp2ConnectionHandler(
Function<VertxHttp2ConnectionHandler<C>, C> connectionFactory,
Expand All @@ -54,7 +53,6 @@ public VertxHttp2ConnectionHandler(
Http2ConnectionEncoder encoder,
Http2Settings initialSettings) {
super(decoder, encoder, initialSettings);
this.defaultController = decoder.flowController();
this.connectionFactory = connectionFactory;
this.useDecompressor = useDecompressor;
this.initialSettings = initialSettings;
Expand Down Expand Up @@ -388,19 +386,7 @@ public void onSettingsAckRead(ChannelHandlerContext ctx) throws Http2Exception {
@Override
public void onSettingsRead(ChannelHandlerContext ctx, Http2Settings settings) throws Http2Exception {
if (useDecompressor) {
decoder().frameListener(new DelegatingDecompressorFrameListener(decoder().connection(), connection) {
@Override
public int onDataRead(ChannelHandlerContext ctx, int streamId, ByteBuf data, int padding, boolean endOfStream) throws Http2Exception {
// Work around padded decompression
// this should be removed when response decompression is fixed
if (padding > 0) {
VertxHttp2Stream<?> stream = connection.stream(streamId);
defaultController.consumeBytes(stream.stream, padding);
padding = 0;
}
return super.onDataRead(ctx, streamId, data, padding, endOfStream);
}
});
decoder().frameListener(new DelegatingDecompressorFrameListener(decoder().connection(), connection));
} else {
decoder().frameListener(connection);
}
Expand Down
Loading