Skip to content

Commit 826a7c9

Browse files
committed
Revert "Fix for ipv6 link local with scope (#9326)"
This reverts commit c1abc7f. It produced compilation issues inside Google. I strongly suspect it isn't this commit or gRPC's fault, but it prevents further testing until it is resolved.
1 parent 5991239 commit 826a7c9

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

okhttp/src/main/java/io/grpc/okhttp/OkHttpProtocolNegotiator.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
import static com.google.common.base.Preconditions.checkNotNull;
2020

2121
import com.google.common.annotations.VisibleForTesting;
22-
import com.google.common.net.HostAndPort;
23-
import com.google.common.net.InetAddresses;
2422
import io.grpc.internal.GrpcUtil;
2523
import io.grpc.okhttp.internal.OptionalMethod;
2624
import io.grpc.okhttp.internal.Platform;
@@ -249,9 +247,7 @@ protected void configureTlsExtensions(
249247
} else {
250248
SET_USE_SESSION_TICKETS.invokeOptionalWithoutCheckedException(sslSocket, true);
251249
}
252-
if (SET_SERVER_NAMES != null
253-
&& SNI_HOST_NAME != null
254-
&& !InetAddresses.isInetAddress(HostAndPort.fromString(hostname).getHost())) {
250+
if (SET_SERVER_NAMES != null && SNI_HOST_NAME != null) {
255251
SET_SERVER_NAMES
256252
.invoke(sslParams, Collections.singletonList(SNI_HOST_NAME.newInstance(hostname)));
257253
} else {

0 commit comments

Comments
 (0)