You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2013/01/07 15:43:41 UTC
svn commit: r1429824 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/example/ solr/example/contexts/solr.xml solr/example/etc/jetty.xml
Author: uschindler
Date: Mon Jan 7 14:43:41 2013
New Revision: 1429824
URL: http://svn.apache.org/viewvc?rev=1429824&view=rev
Log:
Merged revision(s) 1429822 from lucene/dev/trunk:
SOLR-4265: Remove useless setting in Jetty's server config file, as maximum form content is now handled by solr's RequestParser and not the web container.
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/example/ (props changed)
lucene/dev/branches/branch_4x/solr/example/contexts/solr.xml
lucene/dev/branches/branch_4x/solr/example/etc/jetty.xml
Modified: lucene/dev/branches/branch_4x/solr/example/contexts/solr.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/contexts/solr.xml?rev=1429824&r1=1429823&r2=1429824&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/contexts/solr.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/contexts/solr.xml Mon Jan 7 14:43:41 2013
@@ -5,6 +5,4 @@
<Set name="war"><SystemProperty name="jetty.home"/>/webapps/solr.war</Set>
<Set name="defaultsDescriptor"><SystemProperty name="jetty.home"/>/etc/webdefault.xml</Set>
<Set name="tempDirectory"><Property name="jetty.home" default="."/>/solr-webapp</Set>
- <!-- Increase the maximum POST size to 1 MB to be able to handle large shard requests -->
- <Set name="maxFormContentSize">1000000</Set>
</Configure>
Modified: lucene/dev/branches/branch_4x/solr/example/etc/jetty.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/etc/jetty.xml?rev=1429824&r1=1429823&r2=1429824&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/etc/jetty.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/etc/jetty.xml Mon Jan 7 14:43:41 2013
@@ -12,17 +12,6 @@
<Configure id="Server" class="org.eclipse.jetty.server.Server">
- <!-- Increase the maximum POST size to 1 MB to be able to handle large shard requests -->
- <!-- allthough documented as the correct way to set the max POST size for
- all webapps in a single server, this doesn't actaully work.
- So instead it is set on the WebAppContext.
- -->
- <!--
- <Call name="setAttribute">
- <Arg>org.eclipse.jetty.server.Request.maxFormContentSize</Arg>
- <Arg>1000000</Arg>
- </Call>
- -->
<!-- =========================================================== -->
<!-- Server Thread Pool -->
<!-- =========================================================== -->