You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2017/06/21 07:10:47 UTC
[21/50] [abbrv] lucene-solr:feature/autoscaling: SOLR-9623: Disable
remote streaming in example configs by default. Adjust Upload Limit defaults
SOLR-9623: Disable remote streaming in example configs by default. Adjust Upload Limit defaults
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/4746ff0e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/4746ff0e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/4746ff0e
Branch: refs/heads/feature/autoscaling
Commit: 4746ff0ec8a008d42a44c6e6dd3e94cbb2886410
Parents: b1b566f
Author: Jan Høydahl <ja...@apache.org>
Authored: Tue Jun 20 11:00:08 2017 +0200
Committer: Jan Høydahl <ja...@apache.org>
Committed: Tue Jun 20 11:00:08 2017 +0200
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../solr/collection1/conf/solrconfig.xml | 7 ++---
.../collection1/conf/dataimport-solrconfig.xml | 5 ++--
.../conf/contentstream-solrconfig.xml | 7 ++---
.../conf/dataimport-nodatasource-solrconfig.xml | 5 ++--
.../collection1/conf/dataimport-solrconfig.xml | 5 ++--
.../solr/collection1/conf/solrconfig.xml | 3 +--
.../conf/solrconfig-languageidentifier.xml | 3 +--
.../uima/solr/collection1/conf/solrconfig.xml | 4 +--
.../uima/uima-tokenizers-solrconfig.xml | 4 +--
.../java/org/apache/solr/core/SolrConfig.java | 6 +++--
.../conf/solrconfig-analytics-query.xml | 3 +--
.../conf/solrconfig-collapseqparser.xml | 3 +--
.../conf/solrconfig-components-name.xml | 3 +--
.../conf/solrconfig-delaying-component.xml | 2 +-
.../conf/solrconfig-doctransformers.xml | 2 +-
.../collection1/conf/solrconfig-elevate.xml | 3 +--
.../solr/collection1/conf/solrconfig-hash.xml | 2 +-
.../conf/solrconfig-master-throttled.xml | 3 +--
.../solr/collection1/conf/solrconfig-master.xml | 3 +--
.../conf/solrconfig-master1-keepOneBackup.xml | 3 +--
.../collection1/conf/solrconfig-master1.xml | 3 +--
.../collection1/conf/solrconfig-master2.xml | 3 +--
.../collection1/conf/solrconfig-master3.xml | 3 +--
.../collection1/conf/solrconfig-nocache.xml | 2 +-
.../conf/solrconfig-plugcollector.xml | 3 +--
.../collection1/conf/solrconfig-repeater.xml | 3 +--
.../solr/collection1/conf/solrconfig-slave.xml | 3 +--
.../solr/collection1/conf/solrconfig-slave1.xml | 3 +--
.../solr/collection1/conf/solrconfig-sql.xml | 2 +-
.../solr/collection1/conf/solrconfig.xml | 3 +--
.../solr/collection1/conf/solrconfig_perf.xml | 2 +-
.../example-DIH/solr/db/conf/solrconfig.xml | 15 +++++------
.../example-DIH/solr/mail/conf/solrconfig.xml | 15 +++++------
.../example-DIH/solr/solr/conf/solrconfig.xml | 15 +++++------
solr/example/files/conf/solrconfig.xml | 13 +++++----
.../basic_configs/conf/solrconfig.xml | 13 +++++----
.../conf/solrconfig.xml | 13 +++++----
.../conf/solrconfig.xml | 15 +++++------
solr/solr-ref-guide/src/content-streams.adoc | 28 +++++++++++++-------
.../src/requestdispatcher-in-solrconfig.adoc | 12 ++++-----
...g-data-with-solr-cell-using-apache-tika.adoc | 9 -------
.../solr/collection1/conf/solrconfig-slave1.xml | 3 +--
.../solr/collection1/conf/solrconfig-sql.xml | 2 +-
.../solrj/solr/collection1/conf/solrconfig.xml | 2 +-
.../solr/configsets/ml/conf/solrconfig.xml | 2 +-
.../solr/configsets/shared/conf/solrconfig.xml | 2 +-
.../configsets/streaming/conf/solrconfig.xml | 2 +-
.../solr/multicore/core0/conf/solrconfig.xml | 2 +-
.../solr/multicore/core1/conf/solrconfig.xml | 2 +-
50 files changed, 129 insertions(+), 144 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index b163a7f..cc67391 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -283,6 +283,8 @@ Other Changes
* SOLR-10779: JavaBinCodec should use close consistently rather than having marshal() and close() call finish()
(which closes the underlying stream). (Erick Erickson)
+* SOLR-9623: Disable remote streaming in example configs by default. Adjust Upload Limit defaults (janhoy, yonik)
+
================== 6.7.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml b/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml
index 6482286..74d903e 100644
--- a/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml
+++ b/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml
@@ -220,9 +220,10 @@
handleSelect=false will use solr1.1 style error formatting
-->
<requestDispatcher handleSelect="true" >
- <!--Make sure your system has some authentication before enabling remote streaming! -->
- <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" />
-
+ <!--Make sure your system has some authentication before enabling remote streaming!
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
+ -->
+
<!-- Set HTTP caching related parameters (for proxy caches and clients).
To get the behaviour of Solr 1.2 (ie: no caching related headers)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-solrconfig.xml b/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-solrconfig.xml
index 611a250..7672cab 100644
--- a/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-solrconfig.xml
+++ b/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-solrconfig.xml
@@ -179,8 +179,9 @@
handleSelect=false will use solr1.1 style error formatting
-->
<requestDispatcher handleSelect="true" >
- <!--Make sure your system has some authentication before enabling remote streaming! -->
- <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" />
+ <!--Make sure your system has some authentication before enabling remote streaming!
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
+ -->
<!-- Set HTTP caching related parameters (for proxy caches and clients).
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/contentstream-solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/contentstream-solrconfig.xml b/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/contentstream-solrconfig.xml
index e75bf0f..235b15c 100644
--- a/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/contentstream-solrconfig.xml
+++ b/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/contentstream-solrconfig.xml
@@ -179,9 +179,10 @@
handleSelect=false will use solr1.1 style error formatting
-->
<requestDispatcher handleSelect="true" >
- <!--Make sure your system has some authentication before enabling remote streaming! -->
- <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" />
-
+ <!--Make sure your system has some authentication before enabling remote streaming!
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
+ -->
+
<!-- Set HTTP caching related parameters (for proxy caches and clients).
To get the behaviour of Solr 1.2 (ie: no caching related headers)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-nodatasource-solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-nodatasource-solrconfig.xml b/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-nodatasource-solrconfig.xml
index d445278..7f20677 100644
--- a/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-nodatasource-solrconfig.xml
+++ b/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-nodatasource-solrconfig.xml
@@ -181,8 +181,9 @@
handleSelect=false will use solr1.1 style error formatting
-->
<requestDispatcher handleSelect="true" >
- <!--Make sure your system has some authentication before enabling remote streaming! -->
- <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" />
+ <!--Make sure your system has some authentication before enabling remote streaming!
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
+ -->
<!-- Set HTTP caching related parameters (for proxy caches and clients).
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml b/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml
index 1029373..2eacf8a 100644
--- a/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml
+++ b/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml
@@ -179,8 +179,9 @@
handleSelect=false will use solr1.1 style error formatting
-->
<requestDispatcher handleSelect="true" >
- <!--Make sure your system has some authentication before enabling remote streaming! -->
- <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" />
+ <!--Make sure your system has some authentication before enabling remote streaming!
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
+ -->
<!-- Set HTTP caching related parameters (for proxy caches and clients).
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml b/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml
index ed33c6b..261263e 100644
--- a/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml
+++ b/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml
@@ -227,9 +227,8 @@
</highlighting>
- <!-- enable streaming for testing... -->
<requestDispatcher handleSelect="true" >
- <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048" />
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
</httpCaching>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xml b/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xml
index 520d772..04b75f2 100644
--- a/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xml
+++ b/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xml
@@ -48,9 +48,8 @@
<bool name="httpCaching">true</bool>
</requestHandler>
- <!-- enable streaming for testing... -->
<requestDispatcher handleSelect="true" >
- <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048" />
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
</httpCaching>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml b/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml
index d527bf2..a79db3f 100644
--- a/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml
+++ b/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml
@@ -325,8 +325,8 @@
Make sure your system has some authentication before enabling
remote streaming!
-->
- <requestParsers enableRemoteStreaming="true"
- multipartUploadLimitInKB="2048000" />
+ <requestParsers enableRemoteStreaming="false"
+ multipartUploadLimitInKB="-1" />
<!--
Set HTTP caching related parameters (for proxy caches and
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/contrib/uima/src/test-files/uima/uima-tokenizers-solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/uima/src/test-files/uima/uima-tokenizers-solrconfig.xml b/solr/contrib/uima/src/test-files/uima/uima-tokenizers-solrconfig.xml
index e33def7..1a0f58b 100644
--- a/solr/contrib/uima/src/test-files/uima/uima-tokenizers-solrconfig.xml
+++ b/solr/contrib/uima/src/test-files/uima/uima-tokenizers-solrconfig.xml
@@ -324,8 +324,8 @@
Make sure your system has some authentication before enabling
remote streaming!
-->
- <requestParsers enableRemoteStreaming="true"
- multipartUploadLimitInKB="2048000" />
+ <requestParsers enableRemoteStreaming="false"
+ multipartUploadLimitInKB="-1" />
<!--
Set HTTP caching related parameters (for proxy caches and
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/core/src/java/org/apache/solr/core/SolrConfig.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/SolrConfig.java b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
index 4e7ab48..12fd6ef 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
@@ -298,10 +298,12 @@ public class SolrConfig extends Config implements MapSerializable {
updateHandlerInfo = loadUpdatehandlerInfo();
multipartUploadLimitKB = getInt(
- "requestDispatcher/requestParsers/@multipartUploadLimitInKB", 2048);
+ "requestDispatcher/requestParsers/@multipartUploadLimitInKB", Integer.MAX_VALUE);
+ if (multipartUploadLimitKB == -1) multipartUploadLimitKB = Integer.MAX_VALUE;
formUploadLimitKB = getInt(
- "requestDispatcher/requestParsers/@formdataUploadLimitInKB", 2048);
+ "requestDispatcher/requestParsers/@formdataUploadLimitInKB", Integer.MAX_VALUE);
+ if (formUploadLimitKB == -1) formUploadLimitKB = Integer.MAX_VALUE;
enableRemoteStreams = getBool(
"requestDispatcher/requestParsers/@enableRemoteStreaming", false);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml
index b5959cc..f729afa 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml
@@ -461,9 +461,8 @@ based HashBitset. -->
</highlighting>
</searchComponent>
- <!-- enable streaming for testing... -->
<requestDispatcher handleSelect="true" >
- <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048" />
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
</httpCaching>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
index 77b456c..8267451 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
@@ -355,9 +355,8 @@ based HashBitset. -->
</highlighting>
</searchComponent>
- <!-- enable streaming for testing... -->
<requestDispatcher handleSelect="true" >
- <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048" />
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
</httpCaching>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml
index cda92d1..fe0e55c 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml
@@ -52,9 +52,8 @@
</arr>
</requestHandler>
- <!-- enable streaming for testing... -->
<requestDispatcher handleSelect="true" >
- <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048" />
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
</httpCaching>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/core/src/test-files/solr/collection1/conf/solrconfig-delaying-component.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-delaying-component.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-delaying-component.xml
index 033a73e..91f1068 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-delaying-component.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-delaying-component.xml
@@ -35,7 +35,7 @@
</requestHandler>
<requestDispatcher handleSelect="true" >
- <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048" />
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
<httpCaching never304="true" />
</requestDispatcher>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/core/src/test-files/solr/collection1/conf/solrconfig-doctransformers.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-doctransformers.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-doctransformers.xml
index 5b269af..b242f11 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-doctransformers.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-doctransformers.xml
@@ -40,7 +40,7 @@
<requestHandler name="/select" class="solr.StandardRequestHandler"/>
<requestDispatcher handleSelect="true" >
- <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" />
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
</requestDispatcher>
<!-- config for the admin interface -->
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml
index e190d68..03efed6 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml
@@ -150,9 +150,8 @@
</arr>
</requestHandler>-->
- <!-- enable streaming for testing... -->
<requestDispatcher handleSelect="true" >
- <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048" />
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
</httpCaching>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/core/src/test-files/solr/collection1/conf/solrconfig-hash.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-hash.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-hash.xml
index 911fbb2..94cceb61 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-hash.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-hash.xml
@@ -47,7 +47,7 @@
</requestHandler>
<requestDispatcher handleSelect="true" >
- <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" />
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
</requestDispatcher>
<requestHandler name="standard" class="solr.StandardRequestHandler" default="true" />
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/core/src/test-files/solr/collection1/conf/solrconfig-master-throttled.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master-throttled.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master-throttled.xml
index 5bc5ac7..516d504 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master-throttled.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master-throttled.xml
@@ -56,9 +56,8 @@
</lst>
</requestHandler>
- <!-- enable streaming for testing... -->
<requestDispatcher handleSelect="true">
- <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048"/>
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/>
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
</httpCaching>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml
index 75bbfe9..b1345ac 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml
@@ -60,9 +60,8 @@
</lst>
</requestHandler>
- <!-- enable streaming for testing... -->
<requestDispatcher handleSelect="true">
- <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048"/>
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/>
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
</httpCaching>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml
index 034b19c..69f7659 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml
@@ -39,9 +39,8 @@
</requestHandler>
- <!-- enable streaming for testing... -->
<requestDispatcher handleSelect="true">
- <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048"/>
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/>
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
</httpCaching>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml
index fedb32a..db39b1f 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml
@@ -58,9 +58,8 @@
</lst>
</requestHandler>
- <!-- enable streaming for testing... -->
<requestDispatcher handleSelect="true">
- <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048"/>
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/>
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
</httpCaching>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml
index 778cfb7..91923c9 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml
@@ -56,9 +56,8 @@
</lst>
</requestHandler>
- <!-- enable streaming for testing... -->
<requestDispatcher handleSelect="true">
- <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048"/>
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/>
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
</httpCaching>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml
index 33d47fc..b03aef4 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml
@@ -57,9 +57,8 @@
</lst>
</requestHandler>
- <!-- enable streaming for testing... -->
<requestDispatcher handleSelect="true">
- <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048"/>
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/>
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
</httpCaching>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml
index c6d33b2..15e58af 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml
@@ -35,7 +35,7 @@
<requestHandler name="standard" class="solr.StandardRequestHandler"/>
<requestDispatcher handleSelect="true" >
- <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048" />
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
<httpCaching never304="true" />
</requestDispatcher>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml
index 75f7ced..09f0974 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml
@@ -458,9 +458,8 @@ based HashBitset. -->
</highlighting>
</searchComponent>
- <!-- enable streaming for testing... -->
<requestDispatcher handleSelect="true" >
- <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048" />
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
</httpCaching>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml
index 511a13b..76c379c 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml
@@ -51,9 +51,8 @@
</lst>
</requestHandler>
- <!-- enable streaming for testing... -->
<requestDispatcher handleSelect="true">
- <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048"/>
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/>
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
</httpCaching>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml
index fc3926d..5ca7184 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml
@@ -49,9 +49,8 @@
</lst>
</requestHandler>
- <!-- enable streaming for testing... -->
<requestDispatcher handleSelect="true">
- <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048"/>
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/>
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
</httpCaching>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml
index 0e94c6c..aa2f8a4 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml
@@ -42,9 +42,8 @@
</requestHandler>
- <!-- enable streaming for testing... -->
<requestDispatcher handleSelect="true">
- <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048"/>
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/>
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
</httpCaching>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/core/src/test-files/solr/collection1/conf/solrconfig-sql.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-sql.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-sql.xml
index 10feac9..6a0c5b5 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-sql.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-sql.xml
@@ -45,7 +45,7 @@
</requestHandler>
<requestDispatcher handleSelect="true" >
- <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" />
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
</requestDispatcher>
<requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" />
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
index 27f2e42..afbef84 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
@@ -460,9 +460,8 @@
</highlighting>
</searchComponent>
- <!-- enable streaming for testing... -->
<requestDispatcher handleSelect="true" >
- <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048" />
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
</httpCaching>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml
index c0b297f..cc6f97b 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml
@@ -62,7 +62,7 @@
<requestDispatcher handleSelect="true" >
<!--Make sure your system has some authentication before enabling remote streaming! -->
- <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048000" />
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
<httpCaching lastModifiedFrom="openTime"
etagSeed="Solr">
</httpCaching>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/example/example-DIH/solr/db/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/db/conf/solrconfig.xml b/solr/example/example-DIH/solr/db/conf/solrconfig.xml
index 8513aa0..46e7b87 100644
--- a/solr/example/example-DIH/solr/db/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/db/conf/solrconfig.xml
@@ -628,15 +628,14 @@
plugins.
*** WARNING ***
- The settings below authorize Solr to fetch remote files, You
- should make sure your system has some authentication before
- using enableRemoteStreaming="true"
-
- -->
- <requestParsers enableRemoteStreaming="true"
- multipartUploadLimitInKB="2048000"
- formdataUploadLimitInKB="2048"
+ Before enabling remote streaming, you should make sure your
+ system has authentication enabled.
+
+ <requestParsers enableRemoteStreaming="false"
+ multipartUploadLimitInKB="-1"
+ formdataUploadLimitInKB="-1"
addHttpRequestToContext="false"/>
+ -->
<!-- HTTP Caching
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/mail/conf/solrconfig.xml b/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
index 7120e43..950a891 100644
--- a/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
@@ -631,15 +631,14 @@
plugins.
*** WARNING ***
- The settings below authorize Solr to fetch remote files, You
- should make sure your system has some authentication before
- using enableRemoteStreaming="true"
-
- -->
- <requestParsers enableRemoteStreaming="true"
- multipartUploadLimitInKB="2048000"
- formdataUploadLimitInKB="2048"
+ Before enabling remote streaming, you should make sure your
+ system has authentication enabled.
+
+ <requestParsers enableRemoteStreaming="false"
+ multipartUploadLimitInKB="-1"
+ formdataUploadLimitInKB="-1"
addHttpRequestToContext="false"/>
+ -->
<!-- HTTP Caching
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/solr/conf/solrconfig.xml b/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
index 5fc9711..0fd689f 100644
--- a/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
@@ -628,15 +628,14 @@
plugins.
*** WARNING ***
- The settings below authorize Solr to fetch remote files, You
- should make sure your system has some authentication before
- using enableRemoteStreaming="true"
-
- -->
- <requestParsers enableRemoteStreaming="true"
- multipartUploadLimitInKB="2048000"
- formdataUploadLimitInKB="2048"
+ Before enabling remote streaming, you should make sure your
+ system has authentication enabled.
+
+ <requestParsers enableRemoteStreaming="false"
+ multipartUploadLimitInKB="-1"
+ formdataUploadLimitInKB="-1"
addHttpRequestToContext="false"/>
+ -->
<!-- HTTP Caching
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/example/files/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/files/conf/solrconfig.xml b/solr/example/files/conf/solrconfig.xml
index 35ec28e..d16ddb1 100644
--- a/solr/example/files/conf/solrconfig.xml
+++ b/solr/example/files/conf/solrconfig.xml
@@ -626,15 +626,14 @@
plugins.
*** WARNING ***
- The settings below authorize Solr to fetch remote files, You
- should make sure your system has some authentication before
- using enableRemoteStreaming="true"
+ Before enabling remote streaming, you should make sure your
+ system has authentication enabled.
- -->
- <requestParsers enableRemoteStreaming="true"
- multipartUploadLimitInKB="2048000"
- formdataUploadLimitInKB="2048"
+ <requestParsers enableRemoteStreaming="false"
+ multipartUploadLimitInKB="-1"
+ formdataUploadLimitInKB="-1"
addHttpRequestToContext="false"/>
+ -->
<!-- HTTP Caching
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml b/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
index 770ac60..64d59fc 100644
--- a/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
@@ -646,15 +646,14 @@
plugins.
*** WARNING ***
- The settings below authorize Solr to fetch remote files, You
- should make sure your system has some authentication before
- using enableRemoteStreaming="true"
+ Before enabling remote streaming, you should make sure your
+ system has authentication enabled.
- -->
- <requestParsers enableRemoteStreaming="true"
- multipartUploadLimitInKB="2048000"
- formdataUploadLimitInKB="2048"
+ <requestParsers enableRemoteStreaming="false"
+ multipartUploadLimitInKB="-1"
+ formdataUploadLimitInKB="-1"
addHttpRequestToContext="false"/>
+ -->
<!-- HTTP Caching
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml b/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
index 33ef773..1cb477b 100644
--- a/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
@@ -646,15 +646,14 @@
plugins.
*** WARNING ***
- The settings below authorize Solr to fetch remote files, You
- should make sure your system has some authentication before
- using enableRemoteStreaming="true"
+ Before enabling remote streaming, you should make sure your
+ system has authentication enabled.
- -->
- <requestParsers enableRemoteStreaming="true"
- multipartUploadLimitInKB="2048000"
- formdataUploadLimitInKB="2048"
+ <requestParsers enableRemoteStreaming="false"
+ multipartUploadLimitInKB="-1"
+ formdataUploadLimitInKB="-1"
addHttpRequestToContext="false"/>
+ -->
<!-- HTTP Caching
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
index 698213d..b1ad3a5 100644
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
@@ -678,15 +678,14 @@
plugins.
*** WARNING ***
- The settings below authorize Solr to fetch remote files, You
- should make sure your system has some authentication before
- using enableRemoteStreaming="true"
-
- -->
- <requestParsers enableRemoteStreaming="true"
- multipartUploadLimitInKB="2048000"
- formdataUploadLimitInKB="2048"
+ Before enabling remote streaming, you should make sure your
+ system has authentication enabled.
+
+ <requestParsers enableRemoteStreaming="false"
+ multipartUploadLimitInKB="-1"
+ formdataUploadLimitInKB="-1"
addHttpRequestToContext="false"/>
+ -->
<!-- HTTP Caching
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/solr-ref-guide/src/content-streams.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/content-streams.adoc b/solr/solr-ref-guide/src/content-streams.adoc
index 438fa77..2dc6404 100644
--- a/solr/solr-ref-guide/src/content-streams.adoc
+++ b/solr/solr-ref-guide/src/content-streams.adoc
@@ -39,23 +39,33 @@ By default, curl sends a `contentType="application/x-www-form-urlencoded"` heade
Remote streaming lets you send the contents of a URL as a stream to a given SolrRequestHandler. You could use remote streaming to send a remote or local file to an update plugin.
-For convenience, remote streaming is enabled in most of the example `solrconfig.xml` files included with Solr, however it is not recommended in a production situation without additional security between you and untrusted remote clients.
+Remote streaming is disabled by default. Enabling it is not recommended in a production situation without additional security between you and untrusted remote clients.
[source,xml]
----
- <!-- *** WARNING ***
- The settings below authorize Solr to fetch remote files, You
- should make sure your system has some authentication before
- using enableRemoteStreaming="true"
- -->
- <requestParsers enableRemoteStreaming="true" />
+ *** WARNING ***
+ Before enabling remote streaming, you should make sure your
+ system has authentication enabled.
+
+ <requestParsers enableRemoteStreaming="false"...>
----
-The default behavior, when `enableRemoteStreaming` is not specified in `solrconfig.xml` is to _not_ allow remote streaming (i.e., `enableRemoteStreaming="false"`).
+When `enableRemoteStreaming` is not specified in `solrconfig.xml`, the default behavior is to _not_ allow remote streaming (i.e., `enableRemoteStreaming="false"`).
+
+Remote streaming can also be enabled through the <<config-api.adoc,Config API>> as follows:
+
+[source]
+----
+curl -d '
+{
+ "set-property" : {"requestDispatcher.requestParsers.enableRemoteStreaming":true}
+}
+' http://localhost:8983/solr/techproducts/config -H 'Content-type:application/json'
+----
[IMPORTANT]
====
-If you `enableRemoteStreaming="true"` is used, be aware that this allows _anyone_ to send a request to any URL or local file. If <<ContentStreams-DebuggingRequests,DumpRequestHandler>> is enabled, it will allow anyone to view any file on your system.
+If `enableRemoteStreaming="true"` is used, be aware that this allows _anyone_ to send a request to any URL or local file. If <<ContentStreams-DebuggingRequests,DumpRequestHandler>> is enabled, it will allow anyone to view any file on your system.
====
[[ContentStreams-DebuggingRequests]]
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/solr-ref-guide/src/requestdispatcher-in-solrconfig.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/requestdispatcher-in-solrconfig.adoc b/solr/solr-ref-guide/src/requestdispatcher-in-solrconfig.adoc
index 430b404..659dd41 100644
--- a/solr/solr-ref-guide/src/requestdispatcher-in-solrconfig.adoc
+++ b/solr/solr-ref-guide/src/requestdispatcher-in-solrconfig.adoc
@@ -46,20 +46,20 @@ In recent versions of Solr, a `/select` requestHandler is defined by default, so
The `<requestParsers>` sub-element controls values related to parsing requests. This is an empty XML element that doesn't have any content, only attributes.
-The attribute `enableRemoteStreaming` controls whether remote streaming of content is allowed. If set to `false`, streaming will not be allowed. Setting it to `true` (the default) lets you specify the location of content to be streamed using `stream.file` or `stream.url` parameters.
+The attribute `enableRemoteStreaming` controls whether remote streaming of content is allowed. If omitted or set to `false` (the default), streaming will not be allowed. Setting it to `true` lets you specify the location of content to be streamed using `stream.file` or `stream.url` parameters.
-If you enable remote streaming, be sure that you have authentication enabled. Otherwise, someone could potentially gain access to your content by accessing arbitrary URLs. It's also a good idea to place Solr behind a firewall to prevent it being accessed from untrusted clients.
+If you enable remote streaming, be sure that you have authentication enabled. Otherwise, someone could potentially gain access to your content by accessing arbitrary URLs. It's also a good idea to place Solr behind a firewall to prevent it from being accessed from untrusted clients.
-The attribute `multipartUploadLimitInKB` sets an upper limit in kilobytes on the size of a document that may be submitted in a multi-part HTTP POST request. The value specified is multiplied by 1024 to determine the size in bytes.
+The attribute `multipartUploadLimitInKB` sets an upper limit in kilobytes on the size of a document that may be submitted in a multi-part HTTP POST request. The value specified is multiplied by 1024 to determine the size in bytes. A value of `-1` means MAX_INT, which is also the system default if omitted.
-The attribute `formdataUploadLimitInKB` sets a limit in kilobytes on the size of form data (application/x-www-form-urlencoded) submitted in a HTTP POST request, which can be used to pass request parameters that will not fit in a URL.
+The attribute `formdataUploadLimitInKB` sets a limit in kilobytes on the size of form data (application/x-www-form-urlencoded) submitted in a HTTP POST request, which can be used to pass request parameters that will not fit in a URL. A value of `-1` means MAX_INT, which is also the system default if omitted.
The attribute `addHttpRequestToContext` can be used to indicate that the original `HttpServletRequest` object should be included in the context map of the `SolrQueryRequest` using the key `httpRequest`. This `HttpServletRequest` is not used by any Solr component, but may be useful when developing custom plugins.
[source,xml]
----
-<requestParsers enableRemoteStreaming="true"
- multipartUploadLimitInKB="2048000"
+<requestParsers enableRemoteStreaming="false"
+ multipartUploadLimitInKB="2048"
formdataUploadLimitInKB="2048"
addHttpRequestToContext="false" />
----
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/solr-ref-guide/src/uploading-data-with-solr-cell-using-apache-tika.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/uploading-data-with-solr-cell-using-apache-tika.adoc b/solr/solr-ref-guide/src/uploading-data-with-solr-cell-using-apache-tika.adoc
index 8096e8c..894e949 100644
--- a/solr/solr-ref-guide/src/uploading-data-with-solr-cell-using-apache-tika.adoc
+++ b/solr/solr-ref-guide/src/uploading-data-with-solr-cell-using-apache-tika.adoc
@@ -216,15 +216,6 @@ The `tika.config` entry points to a file containing a Tika configuration. The `d
* `EEEE, dd-MMM-yy HH:mm:ss zzz`
* `EEE MMM d HH:mm:ss yyyy`
-You may also need to adjust the `multipartUploadLimitInKB` attribute as follows if you are submitting very large documents.
-
-[source,xml]
-----
-<requestDispatcher handleSelect="true" >
- <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="20480" />
- ...
-----
-
[[UploadingDatawithSolrCellusingApacheTika-Parserspecificproperties]]
=== Parser-Specific Properties
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-slave1.xml
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-slave1.xml b/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-slave1.xml
index c527d7b..9114cfd 100644
--- a/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-slave1.xml
+++ b/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-slave1.xml
@@ -47,9 +47,8 @@
</requestHandler>
- <!-- enable streaming for testing... -->
<requestDispatcher handleSelect="true">
- <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048"/>
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/>
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
</httpCaching>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-sql.xml
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-sql.xml b/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-sql.xml
index 10feac9..6a0c5b5 100644
--- a/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-sql.xml
+++ b/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-sql.xml
@@ -45,7 +45,7 @@
</requestHandler>
<requestDispatcher handleSelect="true" >
- <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" />
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
</requestDispatcher>
<requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" />
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig.xml b/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig.xml
index 3368b69..a2db090 100644
--- a/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig.xml
+++ b/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig.xml
@@ -36,7 +36,7 @@
</updateHandler>
<requestDispatcher handleSelect="true" >
- <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" />
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
</requestDispatcher>
<requestHandler name="standard" class="solr.StandardRequestHandler" default="true" />
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/solrj/src/test-files/solrj/solr/configsets/ml/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test-files/solrj/solr/configsets/ml/conf/solrconfig.xml b/solr/solrj/src/test-files/solrj/solr/configsets/ml/conf/solrconfig.xml
index 6b10869..b404e87 100644
--- a/solr/solrj/src/test-files/solrj/solr/configsets/ml/conf/solrconfig.xml
+++ b/solr/solrj/src/test-files/solrj/solr/configsets/ml/conf/solrconfig.xml
@@ -37,7 +37,7 @@
<requestDispatcher handleSelect="true" >
- <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" />
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
</requestDispatcher>
<requestHandler name="standard" class="solr.StandardRequestHandler" default="true" />
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/solrconfig.xml b/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/solrconfig.xml
index 0b34685..6beb0b7 100644
--- a/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/solrconfig.xml
+++ b/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/solrconfig.xml
@@ -36,7 +36,7 @@
</updateHandler>
<requestDispatcher handleSelect="true" >
- <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" />
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
</requestDispatcher>
<requestHandler name="standard" class="solr.StandardRequestHandler" default="true" />
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/solrj/src/test-files/solrj/solr/configsets/streaming/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test-files/solrj/solr/configsets/streaming/conf/solrconfig.xml b/solr/solrj/src/test-files/solrj/solr/configsets/streaming/conf/solrconfig.xml
index bb98650..c7985d2 100644
--- a/solr/solrj/src/test-files/solrj/solr/configsets/streaming/conf/solrconfig.xml
+++ b/solr/solrj/src/test-files/solrj/solr/configsets/streaming/conf/solrconfig.xml
@@ -37,7 +37,7 @@
<requestDispatcher handleSelect="true" >
- <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" />
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
</requestDispatcher>
<requestHandler name="standard" class="solr.StandardRequestHandler" default="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/solrconfig.xml b/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/solrconfig.xml
index e49a3b7..58a7892 100644
--- a/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/solrconfig.xml
+++ b/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/solrconfig.xml
@@ -58,7 +58,7 @@
</updateHandler>
<requestDispatcher handleSelect="true" >
- <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" formdataUploadLimitInKB="2048" />
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" formdataUploadLimitInKB="-1" />
</requestDispatcher>
<requestHandler name="standard" class="solr.StandardRequestHandler" default="true" />
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4746ff0e/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/solrconfig.xml b/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/solrconfig.xml
index 825070a..81ee32a 100644
--- a/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/solrconfig.xml
+++ b/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/solrconfig.xml
@@ -58,7 +58,7 @@
</updateHandler>
<requestDispatcher handleSelect="true" >
- <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" formdataUploadLimitInKB="2048" />
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" formdataUploadLimitInKB="-1" />
</requestDispatcher>
<requestHandler name="standard" class="solr.StandardRequestHandler" default="true" />