flasn4nt
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

okhttp: Fix for ipv6 link local with scope (#11725)

This commit is contained in:
MV Shiva 2024-12-05 23:07:32 +05:30 committed by GitHub
parent c080b52f95
commit 65b32e60e0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
okhttp/src/main/java/io/grpc/okhttp/OkHttpProtocolNegotiator.java
View File

@ -19,6 +19,8 @@ package io.grpc.okhttp;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.net.HostAndPort;
import com.google.common.net.InetAddresses;
import io.grpc.internal.GrpcUtil;
import io.grpc.okhttp.internal.OptionalMethod;
import io.grpc.okhttp.internal.Platform;
@ -247,7 +249,9 @@ class OkHttpProtocolNegotiator {
} else {
SET_USE_SESSION_TICKETS.invokeOptionalWithoutCheckedException(sslSocket, true);
}
if (SET_SERVER_NAMES != null && SNI_HOST_NAME != null) {
if (SET_SERVER_NAMES != null
&& SNI_HOST_NAME != null
&& !InetAddresses.isInetAddress(HostAndPort.fromString(hostname).getHost())) {
SET_SERVER_NAMES
.invoke(sslParams, Collections.singletonList(SNI_HOST_NAME.newInstance(hostname)));
} else {