You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2019/12/24 00:03:00 UTC
[lucene-solr] branch jira/SOLR-14136 updated (7b061c2 -> b4982d3)
This is an automated email from the ASF dual-hosted git repository.
rmuir pushed a change to branch jira/SOLR-14136
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from 7b061c2 SOLR-14136: ip whitelist/blacklist via env vars
add 3cfe250 fix regex
add 93309e9 LUCENE-8596: Treat hash mark as comment only at beginning of line in kuromoji user dictionary. Via Masaru Hasegawa and Satoshi Kato
add ef15ae9 SOLR-14125 : Streaming expressions to be loadable from packages (#1108)
add db2b21a1 rvert unnecessary commits
add 45dce34 LUCENE-9102: Add maxQueryLength option to DirectSpellchecker.
add 1425d6c SOLR-14138: enable request log via environ var, remove deprecated jetty class usage, respect SOLR_LOGS_DIR (#1110)
add 663bfe2 LUCENE-9102: update changes.txt
add 403fd05 SOLR-14138: changes.txt
add 1be5b68 LUCENE-9091: UnifiedHighlighter HTML escaping should only escape essentials
new 3c37aee Merge branch 'master' into jira/SOLR-14136
new b4982d3 SOLR-14136: changes.txt entry
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
lucene/CHANGES.txt | 9 +-
.../lucene/analysis/ja/dict/UserDictionary.java | 2 +-
.../analysis/ja/dict/UserDictionaryTest.java | 12 ++
.../org/apache/lucene/analysis/ja/userdict.txt | 4 +
.../search/uhighlight/DefaultPassageFormatter.java | 10 +-
.../uhighlight/TestDefaultPassageFormatter.java | 51 +++++++++
.../search/uhighlight/TestUnifiedHighlighter.java | 2 +-
.../TestUnifiedHighlighterTermIntervals.java | 2 +-
.../lucene/search/spell/DirectSpellChecker.java | 24 +++-
.../search/spell/TestDirectSpellChecker.java | 8 ++
solr/CHANGES.txt | 9 ++
solr/bin/solr | 5 +
solr/bin/solr.cmd | 5 +
solr/bin/solr.in.cmd | 3 +
solr/bin/solr.in.sh | 3 +
.../java/org/apache/solr/handler/GraphHandler.java | 25 ++++-
.../org/apache/solr/handler/SolrConfigHandler.java | 11 +-
.../org/apache/solr/handler/StreamHandler.java | 82 ++++++++++----
.../org/apache/solr/pkg/PackagePluginHolder.java | 7 +-
.../src/test-files/runtimecode/expressible.jar.bin | Bin 0 -> 1977 bytes
solr/core/src/test-files/runtimecode/sig.txt | 9 ++
.../highlight/TestPostingsSolrHighlighter.java | 2 +-
.../solr/highlight/TestUnifiedSolrHighlighter.java | 2 +-
.../src/test/org/apache/solr/pkg/TestPackages.java | 45 +++++++-
solr/server/etc/jetty-requestlog.xml | 43 ++++++++
solr/server/etc/jetty.xml | 30 -----
solr/server/modules/requestlog.mod | 9 ++
.../client/solrj/io/stream/expr/StreamFactory.java | 121 ++++++++++++---------
.../org/apache/solr/client/solrj/io/TestLang.java | 3 +-
29 files changed, 408 insertions(+), 130 deletions(-)
create mode 100644 lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestDefaultPassageFormatter.java
create mode 100644 solr/core/src/test-files/runtimecode/expressible.jar.bin
create mode 100644 solr/server/etc/jetty-requestlog.xml
create mode 100644 solr/server/modules/requestlog.mod
[lucene-solr] 02/02: SOLR-14136: changes.txt entry
Posted by rm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rmuir pushed a commit to branch jira/SOLR-14136
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit b4982d391a40d3028fc04e9ceb82679a30ea9f09
Author: Robert Muir <rm...@apache.org>
AuthorDate: Mon Dec 23 16:02:49 2019 -0800
SOLR-14136: changes.txt entry
---
solr/CHANGES.txt | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 6f26d23..9d17c52 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -166,6 +166,10 @@ Improvements
* SOLR-14138: Jetty's NCSA-formatted RequestLog can be enabled via environment variable,
SOLR_REQUESTLOG_ENABLED=true. This will respect SOLR_LOGS_DIR if it is set. (rmuir)
+* SOLR-14136: Jetty's InetAccessHandler can be enabled via environment variables,
+ SOLR_IP_WHITELIST and SOLR_IP_BLACKLIST. These variables can restrict access to
+ Solr based on IP addresses/networks. (rmuir)
+
Optimizations
---------------------
(No changes)
[lucene-solr] 01/02: Merge branch 'master' into jira/SOLR-14136
Posted by rm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rmuir pushed a commit to branch jira/SOLR-14136
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 3c37aee2a4b062c160e505e9cb5191fb147e310a
Merge: 7b061c2 1be5b68
Author: Robert Muir <rm...@apache.org>
AuthorDate: Mon Dec 23 15:59:00 2019 -0800
Merge branch 'master' into jira/SOLR-14136
lucene/CHANGES.txt | 9 +-
.../lucene/analysis/ja/dict/UserDictionary.java | 2 +-
.../analysis/ja/dict/UserDictionaryTest.java | 12 ++
.../org/apache/lucene/analysis/ja/userdict.txt | 4 +
.../search/uhighlight/DefaultPassageFormatter.java | 10 +-
.../uhighlight/TestDefaultPassageFormatter.java | 51 +++++++++
.../search/uhighlight/TestUnifiedHighlighter.java | 2 +-
.../TestUnifiedHighlighterTermIntervals.java | 2 +-
.../lucene/search/spell/DirectSpellChecker.java | 24 +++-
.../search/spell/TestDirectSpellChecker.java | 8 ++
solr/CHANGES.txt | 5 +
solr/bin/solr | 5 +
solr/bin/solr.cmd | 5 +
solr/bin/solr.in.cmd | 3 +
solr/bin/solr.in.sh | 3 +
.../java/org/apache/solr/handler/GraphHandler.java | 25 ++++-
.../org/apache/solr/handler/SolrConfigHandler.java | 11 +-
.../org/apache/solr/handler/StreamHandler.java | 82 ++++++++++----
.../org/apache/solr/pkg/PackagePluginHolder.java | 7 +-
.../src/test-files/runtimecode/expressible.jar.bin | Bin 0 -> 1977 bytes
solr/core/src/test-files/runtimecode/sig.txt | 9 ++
.../highlight/TestPostingsSolrHighlighter.java | 2 +-
.../solr/highlight/TestUnifiedSolrHighlighter.java | 2 +-
.../src/test/org/apache/solr/pkg/TestPackages.java | 45 +++++++-
solr/server/etc/jetty-requestlog.xml | 43 ++++++++
solr/server/etc/jetty.xml | 30 -----
solr/server/modules/requestlog.mod | 9 ++
.../client/solrj/io/stream/expr/StreamFactory.java | 121 ++++++++++++---------
.../org/apache/solr/client/solrj/io/TestLang.java | 3 +-
29 files changed, 404 insertions(+), 130 deletions(-)