lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jim...@apache.org
Subject [lucene-solr] branch master updated: Fix Windows startup script to disable HTTP/2 if TLS is enabled on Java 8.
Date Thu, 07 Mar 2019 13:33:53 GMT
This is an automated email from the ASF dual-hosted git repository.

jimczi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/master by this push:
     new db5f1af  Fix Windows startup script to disable HTTP/2 if TLS is enabled on Java 8.
db5f1af is described below

commit db5f1af59bb2cdec66cc6b43ec7d53c3469aa94e
Author: Uwe Schindler <uschindler@apache.org>
AuthorDate: Thu Mar 7 14:16:28 2019 +0100

    Fix Windows startup script to disable HTTP/2 if TLS is enabled on Java 8.
---
 solr/CHANGES.txt  | 2 ++
 solr/bin/solr.cmd | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 62febfd..3579e9d 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -311,6 +311,8 @@ Bug Fixes
 * SOLR-13255 : ClasscastException when URPs try to read a String field which returns a ByteArrayUTF8CHarSequence
. This is a regression
   in release 7.7 (noble)
 
+*SOLR-13299: Fix Windows startup script to disable HTTP/2 if TLS is enabled on Java 8. (Uwe
Schindler)
+
 
 Improvements
 ----------------------
diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
index 34eaf66..d3932bf 100755
--- a/solr/bin/solr.cmd
+++ b/solr/bin/solr.cmd
@@ -58,7 +58,12 @@ IF NOT DEFINED SOLR_SSL_ENABLED (
 )
 
 IF "%SOLR_SSL_ENABLED%"=="true" (
-  set "SOLR_JETTY_CONFIG=--lib="%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*" --module=https"
+  set "SOLR_JETTY_CONFIG=--lib="%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*""
+  if !JAVA_MAJOR_VERSION! GEQ 9  (
+    set "SOLR_JETTY_CONFIG=!SOLR_JETTY_CONFIG! --module=https"
+  ) else (
+    set "SOLR_JETTY_CONFIG=!SOLR_JETTY_CONFIG! --module=https8"
+  )
   set SOLR_URL_SCHEME=https
   IF DEFINED SOLR_SSL_KEY_STORE (
     set "SOLR_SSL_OPTS=!SOLR_SSL_OPTS! -Dsolr.jetty.keystore=%SOLR_SSL_KEY_STORE%"


Mime
View raw message