Docs: Move "allowCasualMultipartParsing",

"swallowAbortedUploads" and "swallowOutput"
from StandardContext to Context.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1079671 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml
index 77ee3ff..7243f58 100644 (file)
--- a/webapps/docs/config/context.xml
+++ b/webapps/docs/config/context.xml
@@ -184,6 +184,17 @@
 
     <attributes>
 
+      <attribute name="allowCasualMultipartParsing" required="false">
+        <p>Set to true if Tomcat should automatically parse
+        multipart/form-data request bodies when HttpServletRequest.getPart*
+        or HttpServletRequest.getParameter* is called, even when the
+        target servlet isn't marked with the @MultipartConfig annotation
+        (See Servlet Specification 3.0, Section 3.2 for details).
+        Note that any setting other than <code>false</code> causes Tomcat
+        to behave in a way that is not technically spec-compliant.
+        The default is <code>false</code></p>
+      </attribute>
+
       <attribute name="backgroundProcessorDelay" required="false">
         <p>This value represents the delay in seconds between the 
         invocation of the backgroundProcess method on this context and 
@@ -333,6 +344,33 @@
         file.</p>
       </attribute>
       
+      <attribute name="swallowAbortedUploads" required="false">
+        <p>Set to false if Tomcat should <b>not</b> read any additional
+        request body data for aborted uploads and instead abort the client
+        connection. This setting is used in the following situations:
+        <ul>
+        <li>the size of the request body is larger than the
+        <code>maxPostSize</code> configured in the connector
+        </li>
+        <li>the size limit of a MultiPart upload is reached
+        </li>
+        <li>the servlet sets the response status to 413
+        (Request Entity Too Large)
+        </li>
+        </ul>
+        Not reading the additional data will free the request processing thread
+        more quickly. Unfortunately most HTTP clients will not read the response
+        in case they can not write the full request.</p>
+        <p>The default is <code>true</code>, so additional data is being read.</p>
+      </attribute>
+
+      <attribute name="swallowOutput" required="false">
+        <p>If the value of this flag is <code>true</code>, the bytes output to
+        System.out and System.err by the web application will be redirected to
+        the web application logger. If not specified, the default value
+        of the flag is <code>false</code>.</p>
+      </attribute>
+
       <attribute name="tldNamespaceAware" required="false">
         <p>If the value of this flag is <code>true</code>, the TLD files
         XML validation will be namespace-aware.  If you turn this flag on,
@@ -434,17 +472,6 @@
         is un-deployed.</p>
       </attribute>
 
-      <attribute name="allowCasualMultipartParsing" required="false">
-        <p>Set to true if Tomcat should automatically parse
-        multipart/form-data request bodies when HttpServletRequest.getPart*
-        or HttpServletRequest.getParameter* is called, even when the
-        target servlet isn't marked with the @MultipartConfig annotation
-        (See Servlet Specification 3.0, Section 3.2 for details).
-        Note that any setting other than <code>false</code> causes Tomcat
-        to behave in a way that is not technically spec-compliant.
-        The default is <code>false</code></p>
-      </attribute>
-
       <attribute name="allowLinking" required="false">
         <p>If the value of this flag is <code>true</code>, symlinks will be
         allowed inside the web application, pointing to resources outside the
@@ -569,33 +596,6 @@
         default value of <code>true</code> will be used.</p>
       </attribute>
 
-      <attribute name="swallowAbortedUploads" required="false">
-        <p>Set to false if Tomcat should <b>not</b> read any additional
-        request body data for aborted uploads and instead abort the client
-        connection. This setting is used in the following situations:
-        <ul>
-        <li>the size of the request body is larger than the
-        <code>maxPostSize</code> configured in the connector
-        </li>
-        <li>the size limit of a MultiPart upload is reached
-        </li>
-        <li>the servlet sets the response status to 413
-        (Request Entity Too Large)
-        </li>
-        </ul>
-        Not reading the additional data will free the request processing thread
-        more quickly. Unfortunately most HTTP clients will not read the response
-        in case they can not write the full request.</p>
-        <p>The default is <code>true</code>, so additional data is being read.</p>
-      </attribute>
-
-      <attribute name="swallowOutput" required="false">
-        <p>If the value of this flag is <code>true</code>, the bytes output to
-        System.out and System.err by the web application will be redirected to
-        the web application logger. If not specified, the default value
-        of the flag is <code>false</code>.</p>
-      </attribute>
-
       <attribute name="unloadDelay" required="false">
         <p>Number of ms that the container will wait for servlets to unload.
         If not specified, the default value is <code>2000</code> ms.</p>