This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-grpc.git
The following commit(s) were added to refs/heads/main by this push:
new 2dec32af Revert "Fixes
https://github.com/playframework/play-grpc/issues/468 (#197)" (#199)
2dec32af is described below
commit 2dec32afa19609096f7acf330d84486252bf2a99
Author: PJ Fanning <[email protected]>
AuthorDate: Mon Dec 25 19:24:40 2023 +0100
Revert "Fixes https://github.com/playframework/play-grpc/issues/468 (#197)"
(#199)
This reverts commit b9a533be65c7e83cc44e41adfb0fcded601fb704.
---
.../scala/org/apache/pekko/grpc/internal/NettyClientUtils.scala | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git
a/runtime/src/main/scala/org/apache/pekko/grpc/internal/NettyClientUtils.scala
b/runtime/src/main/scala/org/apache/pekko/grpc/internal/NettyClientUtils.scala
index 9ce0a6bc..7d27799a 100644
---
a/runtime/src/main/scala/org/apache/pekko/grpc/internal/NettyClientUtils.scala
+++
b/runtime/src/main/scala/org/apache/pekko/grpc/internal/NettyClientUtils.scala
@@ -184,7 +184,6 @@ object NettyClientUtils {
private def createNettySslContext(javaSslContext: SSLContext): SslContext = {
import io.grpc.netty.shaded.io.netty.handler.ssl.{
ApplicationProtocolConfig,
- ApplicationProtocolNames,
ClientAuth,
IdentityCipherSuiteFilter,
JdkSslContext
@@ -196,12 +195,8 @@ object NettyClientUtils {
/* boolean isClient */ true,
/* Iterable<String> ciphers */ null, // use JDK defaults (null is
accepted as indicated in constructor Javadoc)
IdentityCipherSuiteFilter.INSTANCE,
- new ApplicationProtocolConfig(
- ApplicationProtocolConfig.Protocol.ALPN,
- ApplicationProtocolConfig.SelectorFailureBehavior.NO_ADVERTISE,
- ApplicationProtocolConfig.SelectedListenerFailureBehavior.ACCEPT,
- ApplicationProtocolNames.HTTP_2),
- ClientAuth.OPTIONAL, // server-only option, which is ignored as
isClient=true (as indicated in constructor Javadoc)
+ /* ApplicationProtocolConfig apn */ ApplicationProtocolConfig.DISABLED,
// use JDK default (null would also be acceptable, DISABLED config will select
the NONE protocol and thus the JdkDefaultApplicationProtocolNegotiator)
+ ClientAuth.NONE, // server-only option, which is ignored as
isClient=true (as indicated in constructor Javadoc)
/* String[] protocols */ null, // use JDK defaults (null is accepted as
indicated in constructor Javadoc)
/* boolean startTls */ false)
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
