You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by is...@apache.org on 2017/05/29 17:05:39 UTC

lucene-solr:branch_6x: SOLR-10718: Not using pre-emptive authentication interceptor when not using BasicAuth

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_6x 3db93a1f0 -> 91316cc80


SOLR-10718: Not using pre-emptive authentication interceptor when not using BasicAuth


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/91316cc8
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/91316cc8
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/91316cc8

Branch: refs/heads/branch_6x
Commit: 91316cc8037712d81a623078e2e75664a4e03eb4
Parents: 3db93a1
Author: Ishan Chattopadhyaya <is...@apache.org>
Authored: Mon May 29 22:34:45 2017 +0530
Committer: Ishan Chattopadhyaya <is...@apache.org>
Committed: Mon May 29 22:35:28 2017 +0530

----------------------------------------------------------------------
 solr/CHANGES.txt                                                 | 4 ++++
 .../java/org/apache/solr/client/solrj/impl/HttpClientUtil.java   | 1 +
 2 files changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/91316cc8/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 8d2961f..b4de2a5 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -311,6 +311,10 @@ Bug Fixes
 * SOLR-10735: Windows script (solr.cmd) didn't work properly with directory containing spaces. Adding quotations
   to fix (Uwe Schindler, janhoy, Tomas Fernandez-Lobbe, Ishan Chattopadhyaya) 
 
+* SOLR-10718: BasicAuth configuration in script include files caused errors during collection creation. Fixed by not
+  using a Pre-emptive authentication based interceptor when BasicAuth is not used. (Shawn Feldman, Hrishikesh Gadre,
+  janhoy, Jason Gerlowski via Ishan Chattopadhyaya)
+
 Ref Guide
 ----------------------
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/91316cc8/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java
index 7726125..525ccb0 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java
@@ -261,6 +261,7 @@ public class HttpClientUtil {
           new UsernamePasswordCredentials(basicAuthUser, basicAuthPass));
     } else {
       httpClient.getCredentialsProvider().clear();
+      httpClient.removeRequestInterceptorByClass(PreemptiveAuth.class);
     }
   }