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 2012/12/24 22:21:50 UTC

svn commit: r1425684 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/CHANGES.txt solr/example/ solr/example/contexts/solr.xml solr/example/etc/jetty.xml

Author: shalin
Date: Mon Dec 24 21:21:49 2012
New Revision: 1425684

URL: http://svn.apache.org/viewvc?rev=1425684&view=rev
Log:
SOLR-4223: "maxFormContentSize" in jetty.xml is not picked up by jetty 8
  so set it via solr webapp context file

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/solr/   (props changed)
    lucene/dev/branches/branch_4x/solr/CHANGES.txt   (contents, 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/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1425684&r1=1425683&r2=1425684&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Mon Dec 24 21:21:49 2012
@@ -378,6 +378,9 @@ Bug Fixes
 * SOLR-4133: Cannot "set" field to null with partial updates when using the
   standard RequestWriter. (Will Butler, shalin)
 
+* SOLR-4223: "maxFormContentSize" in jetty.xml is not picked up by jetty 8
+  so set it via solr webapp context file. (shalin)
+
 Other Changes
 ----------------------
 

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=1425684&r1=1425683&r2=1425684&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/contexts/solr.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/contexts/solr.xml Mon Dec 24 21:21:49 2012
@@ -5,4 +5,6 @@
   <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=1425684&r1=1425683&r2=1425684&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/etc/jetty.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/etc/jetty.xml Mon Dec 24 21:21:49 2012
@@ -13,11 +13,16 @@
 <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>200000</Arg>
+      <Arg>1000000</Arg>
     </Call>
-
+    -->
     <!-- =========================================================== -->
     <!-- Server Thread Pool                                          -->
     <!-- =========================================================== -->