Skip to content

Commit

Permalink
Update Netty 4.1.59 -> 4.1.60 (#1419)
Browse files Browse the repository at this point in the history
Modifications:
- Add workaround to ProtocolCompatibilityTest for
grpc/grpc-java#7953.
  • Loading branch information
Scottmitch committed Mar 10, 2021
1 parent bcf7a68 commit 1f95e4a
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 1 deletion.
2 changes: 1 addition & 1 deletion gradle.properties
Expand Up @@ -17,7 +17,7 @@
group=io.servicetalk
version=0.38.0-SNAPSHOT

nettyVersion=4.1.59.Final
nettyVersion=4.1.60.Final
tcnativeVersion=2.0.36.Final
jsr305Version=3.0.2

Expand Down
Expand Up @@ -43,8 +43,11 @@
import io.servicetalk.grpc.netty.CompatProto.Compat.ServiceFactory;
import io.servicetalk.grpc.netty.CompatProto.RequestContainer.CompatRequest;
import io.servicetalk.grpc.netty.CompatProto.ResponseContainer.CompatResponse;
import io.servicetalk.http.api.HttpExecutionStrategy;
import io.servicetalk.http.api.HttpServiceContext;
import io.servicetalk.http.api.StreamingHttpClientFilter;
import io.servicetalk.http.api.StreamingHttpRequest;
import io.servicetalk.http.api.StreamingHttpRequester;
import io.servicetalk.http.api.StreamingHttpResponse;
import io.servicetalk.http.api.StreamingHttpResponseFactory;
import io.servicetalk.http.api.StreamingHttpServiceFilter;
Expand Down Expand Up @@ -100,6 +103,9 @@
import static io.servicetalk.encoding.api.ContentCodings.identity;
import static io.servicetalk.grpc.api.GrpcExecutionStrategies.defaultStrategy;
import static io.servicetalk.grpc.api.GrpcExecutionStrategies.noOffloadsStrategy;
import static io.servicetalk.http.api.HttpHeaderNames.CONTENT_LENGTH;
import static io.servicetalk.http.api.HttpHeaderNames.TRANSFER_ENCODING;
import static io.servicetalk.http.api.HttpHeaderValues.CHUNKED;
import static io.servicetalk.test.resources.DefaultTestCerts.loadServerKey;
import static io.servicetalk.test.resources.DefaultTestCerts.loadServerPem;
import static io.servicetalk.transport.api.SecurityConfigurator.SslProvider.OPENSSL;
Expand Down Expand Up @@ -832,6 +838,20 @@ private static CompatClient serviceTalkClient(final SocketAddress serverAddress,
builder.secure().disableHostnameVerification().provider(OPENSSL)
.trustManager(DefaultTestCerts::loadServerCAPem).commit();
}
// TODO(scott): remove after https://github.com/grpc/grpc-java/issues/7953 is resolved.
builder.appendHttpClientFilter(client -> new StreamingHttpClientFilter(client) {
@Override
protected Single<StreamingHttpResponse> request(final StreamingHttpRequester delegate,
final HttpExecutionStrategy strategy,
final StreamingHttpRequest request) {
return Single.defer(() -> {
// Force chunked transfer encoding as a workaround for grpc-java bug.
request.headers().remove(CONTENT_LENGTH);
request.headers().set(TRANSFER_ENCODING, CHUNKED);
return delegate.request(strategy, request).subscribeShareContext();
});
}
});
List<ContentCodec> codings = serviceTalkCodingsFor(compression);
return builder.build(new Compat.ClientFactory().supportedMessageCodings(codings));
}
Expand Down

0 comments on commit 1f95e4a

Please sign in to comment.