From edf2c62fd55b74be7b1a85191f8e2f27099fdf75 Mon Sep 17 00:00:00 2001 From: Jakob Buchgraber Date: Tue, 12 Jul 2016 08:06:19 +0200 Subject: [PATCH] netty: update to 4.1.2.Final and tcnative Fork18 --- build.gradle | 6 +++--- netty/src/main/java/io/grpc/netty/NettyClientHandler.java | 2 +- netty/src/main/java/io/grpc/netty/NettyServerHandler.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index e0607d4aa7..98b878e1f9 100644 --- a/build.gradle +++ b/build.gradle @@ -151,9 +151,9 @@ subprojects { protobuf_plugin: 'com.google.protobuf:protobuf-gradle-plugin:0.7.7', protobuf_util: "com.google.protobuf:protobuf-java-util:${protobufVersion}", - netty: 'io.netty:netty-codec-http2:[4.1.1.Final]', - netty_epoll: 'io.netty:netty-transport-native-epoll:4.1.1.Final' + epoll_suffix, - netty_tcnative: 'io.netty:netty-tcnative-boringssl-static:1.1.33.Fork17', + netty: 'io.netty:netty-codec-http2:[4.1.2.Final]', + netty_epoll: 'io.netty:netty-transport-native-epoll:4.1.2.Final' + epoll_suffix, + netty_tcnative: 'io.netty:netty-tcnative-boringssl-static:1.1.33.Fork18', // Test dependencies. junit: 'junit:junit:4.11', diff --git a/netty/src/main/java/io/grpc/netty/NettyClientHandler.java b/netty/src/main/java/io/grpc/netty/NettyClientHandler.java index f071c1099c..fdda262ab8 100644 --- a/netty/src/main/java/io/grpc/netty/NettyClientHandler.java +++ b/netty/src/main/java/io/grpc/netty/NettyClientHandler.java @@ -116,7 +116,7 @@ class NettyClientHandler extends AbstractNettyHandler { Ticker ticker) { Preconditions.checkArgument(maxHeaderListSize > 0, "maxHeaderListSize must be positive"); Http2HeadersDecoder headersDecoder = new DefaultHttp2HeadersDecoder( - maxHeaderListSize, Http2CodecUtil.DEFAULT_HEADER_TABLE_SIZE, true); + maxHeaderListSize, Http2CodecUtil.DEFAULT_HEADER_TABLE_SIZE, true, 32); Http2FrameReader frameReader = new DefaultHttp2FrameReader(headersDecoder); Http2FrameWriter frameWriter = new DefaultHttp2FrameWriter(); Http2Connection connection = new DefaultHttp2Connection(false); diff --git a/netty/src/main/java/io/grpc/netty/NettyServerHandler.java b/netty/src/main/java/io/grpc/netty/NettyServerHandler.java index 6dfe2d8267..d519fc1e85 100644 --- a/netty/src/main/java/io/grpc/netty/NettyServerHandler.java +++ b/netty/src/main/java/io/grpc/netty/NettyServerHandler.java @@ -108,7 +108,7 @@ class NettyServerHandler extends AbstractNettyHandler { Preconditions.checkArgument(maxHeaderListSize > 0, "maxHeaderListSize must be positive"); Http2FrameLogger frameLogger = new Http2FrameLogger(LogLevel.DEBUG, NettyServerHandler.class); Http2HeadersDecoder headersDecoder = new DefaultHttp2HeadersDecoder( - maxHeaderListSize, Http2CodecUtil.DEFAULT_HEADER_TABLE_SIZE, true); + maxHeaderListSize, Http2CodecUtil.DEFAULT_HEADER_TABLE_SIZE, true, 32); Http2FrameReader frameReader = new Http2InboundFrameLogger( new DefaultHttp2FrameReader(headersDecoder), frameLogger); Http2FrameWriter frameWriter =