Skip to content
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.

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

[Backport] [2.10] Fix protocol detection from https system property (#61) #63

Merged
merged 1 commit into from
Sep 15, 2023
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;

import java.util.Objects;

import javax.net.ssl.SSLContext;

import static org.opensearch.index.codec.customcodecs.CustomCodecService.ZSTD_CODEC;
Expand Down Expand Up @@ -100,7 +102,7 @@ protected void configureHttpOrHttpsClient(RestClientBuilder builder, Settings se

@Override
protected String getProtocol() {
return Strings.isNullOrEmpty(System.getProperty("https")) ? "http" : "https";
return Objects.equals(System.getProperty("https"), "true") ? "https" : "http";
}

/**
Expand Down
Loading