Skip to content

Disable HTTP/2 negotiation for trino-client/jdbc #22171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 28, 2024
Merged

Disable HTTP/2 negotiation for trino-client/jdbc #22171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions client/trino-client/src/main/java/io/trino/client/OkHttpUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

import com.google.common.base.CharMatcher;
import com.google.common.base.StandardSystemProperty;
import com.google.common.collect.ImmutableList;
import com.google.common.net.HostAndPort;
import io.trino.client.auth.kerberos.DelegatedConstrainedContextProvider;
import io.trino.client.auth.kerberos.DelegatedUnconstrainedContextProvider;
Expand All @@ -25,6 +26,7 @@
import okhttp3.Interceptor;
import okhttp3.JavaNetCookieJar;
import okhttp3.OkHttpClient;
import okhttp3.Protocol;
import okhttp3.internal.tls.LegacyHostnameVerifier;
import org.ietf.jgss.GSSCredential;

Expand Down Expand Up @@ -111,6 +113,12 @@ public static void setupCookieJar(OkHttpClient.Builder clientBuilder)
clientBuilder.cookieJar(new JavaNetCookieJar(new CookieManager()));
}

public static void disableHttp2(OkHttpClient.Builder clientBuilder)
{
// Disable HTTP/2 as it's not tested nor supported
clientBuilder.protocols(ImmutableList.of(Protocol.HTTP_1_1, Protocol.HTTP_1_1));
}

public static void setupSocksProxy(OkHttpClient.Builder clientBuilder, Optional<HostAndPort> socksProxy)
{
setupProxy(clientBuilder, socksProxy, SOCKS);
Expand Down
2 changes: 2 additions & 0 deletions client/trino-client/src/main/java/io/trino/client/uri/TrinoUri.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
import static com.google.common.collect.ImmutableMap.toImmutableMap;
import static io.trino.client.KerberosUtil.defaultCredentialCachePath;
import static io.trino.client.OkHttpUtil.basicAuth;
import static io.trino.client.OkHttpUtil.disableHttp2;
import static io.trino.client.OkHttpUtil.setupAlternateHostnameVerification;
import static io.trino.client.OkHttpUtil.setupCookieJar;
import static io.trino.client.OkHttpUtil.setupHttpProxy;
Expand Down Expand Up @@ -603,6 +604,7 @@ public void setupClient(OkHttpClient.Builder builder)
throws SQLException
{
try {
disableHttp2(builder);
setupCookieJar(builder);
setupSocksProxy(builder, socksProxy);
setupHttpProxy(builder, httpProxy);
Expand Down