You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/09/21 03:02:11 UTC
[1/2] lucene-solr:jira/http2: Set using HTTP1 if https url is provided
Repository: lucene-solr
Updated Branches:
refs/heads/jira/http2 4867bb841 -> 7308f0bb3
Set using HTTP1 if https url is provided
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b714c9bd
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b714c9bd
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b714c9bd
Branch: refs/heads/jira/http2
Commit: b714c9bd02e8dcd4e103ceca46d53c77039096ee
Parents: 4867bb8
Author: Cao Manh Dat <da...@apache.org>
Authored: Fri Sep 21 08:16:06 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Fri Sep 21 08:16:06 2018 +0700
----------------------------------------------------------------------
.../java/org/apache/solr/client/solrj/impl/Http2SolrClient.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b714c9bd/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
index dfaf362..bac9aa8 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
@@ -198,7 +198,8 @@ public class Http2SolrClient extends SolrClient {
httpClientExecutor.setDaemon(true);
HttpClientTransport transport;
- if (builder.useHttp1_1 || builder.sslConfig != null) {
+ boolean isHttpsBaseUrl = serverBaseUrl != null && serverBaseUrl.startsWith("https");
+ if (builder.useHttp1_1 || builder.sslConfig != null || isHttpsBaseUrl) {
LOG.info("Create Http2SolrClient with HTTP/1.1 transport");
transport = new HttpClientTransportOverHTTP(2);
[2/2] lucene-solr:jira/http2: Using HTTP1 if keystore is set
Posted by da...@apache.org.
Using HTTP1 if keystore is set
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/7308f0bb
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7308f0bb
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7308f0bb
Branch: refs/heads/jira/http2
Commit: 7308f0bb3fa01681331866d9a629acc0a74bef6d
Parents: b714c9b
Author: Cao Manh Dat <da...@apache.org>
Authored: Fri Sep 21 10:02:03 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Fri Sep 21 10:02:03 2018 +0700
----------------------------------------------------------------------
.../solr/client/solrj/impl/Http2SolrClient.java | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7308f0bb/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
index bac9aa8..dc6a41c 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
@@ -198,8 +198,7 @@ public class Http2SolrClient extends SolrClient {
httpClientExecutor.setDaemon(true);
HttpClientTransport transport;
- boolean isHttpsBaseUrl = serverBaseUrl != null && serverBaseUrl.startsWith("https");
- if (builder.useHttp1_1 || builder.sslConfig != null || isHttpsBaseUrl) {
+ if (useHttp1(builder)) {
LOG.info("Create Http2SolrClient with HTTP/1.1 transport");
transport = new HttpClientTransportOverHTTP(2);
@@ -230,6 +229,18 @@ public class Http2SolrClient extends SolrClient {
return httpClient;
}
+ private boolean useHttp1(Builder builder) {
+ if (serverBaseUrl != null && serverBaseUrl.startsWith("https"))
+ return true;
+
+ if (builder.useHttp1_1 || builder.sslConfig != null)
+ return true;
+
+ if (System.getProperty("javax.net.ssl.trustStore") != null)
+ return true;
+
+ return false;
+ }
public HttpClient getHttpClient() {
return httpClient;