Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Windows startup script to disable HTTP/2 if TLS is enabled on Java 8.

This commit is contained in:
Uwe Schindler 2019-03-07 14:16:28 +01:00 committed by jimczi
parent d2d3942721
commit db5f1af59b
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -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 * SOLR-13255 : ClasscastException when URPs try to read a String field which returns a ByteArrayUTF8CHarSequence . This is a regression
in release 7.7 (noble) 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 Improvements
---------------------- ----------------------

7
solr/bin/solr.cmd
View File

@ -58,7 +58,12 @@ IF NOT DEFINED SOLR_SSL_ENABLED (
) )
IF "%SOLR_SSL_ENABLED%"=="true" ( 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 set SOLR_URL_SCHEME=https
IF DEFINED SOLR_SSL_KEY_STORE ( IF DEFINED SOLR_SSL_KEY_STORE (
set "SOLR_SSL_OPTS=!SOLR_SSL_OPTS! -Dsolr.jetty.keystore=%SOLR_SSL_KEY_STORE%" set "SOLR_SSL_OPTS=!SOLR_SSL_OPTS! -Dsolr.jetty.keystore=%SOLR_SSL_KEY_STORE%"