Author: markt
Date: Wed Feb  4 06:53:13 2009
New Revision: 740632

URL: http://svn.apache.org/viewvc?rev=740632&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46600
Correctly document maxKeepAliveRequests

Modified:
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
    tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml
    tomcat/trunk/webapps/docs/config/http.xml

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=740632&r1=740631&r2=740632&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Feb  4 06:53:13 2009
@@ -482,6 +482,10 @@
         <bug>46563</bug>: Update doc for correct default for pollerThreadCount.
         (markt)
       </fix>
+      <fix>
+        <bug>46600</bug>: Document maxKeepAliveRequests for the NIO connector.
+        (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Other">

Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml?rev=740632&r1=740631&r2=740632&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml Wed Feb  4 06:53:13 2009
@@ -448,6 +448,14 @@
            <code>-1</code> means unlimited, default is <code>200</code>. Set 
this value somewhere close to your maxThreads value.
         </p>
       </attribute>
+      <attribute name="maxKeepAliveRequests" required="false">
+        <p>The maximum number of HTTP requests which can be pipelined until
+        the connection is closed by the server. Setting this attribute to 1 
will
+        disable HTTP/1.0 keep-alive, as well as HTTP/1.1 keep-alive and
+        pipelining. Setting this to -1 will allow an unlimited amount of
+        pipelined or keep-alive HTTP requests.
+        If not specified, this attribute is set to 100.</p>
+      </attribute>
       <attribute name="socket.directBuffer" required="false">
         <p>(bool)Boolean value, whether to use direct ByteBuffers or java 
mapped ByteBuffers. Default is <code>false</code>
            <br/>When you are using direct buffers, make sure you allocate the 
appropriate amount of memory for the 

Modified: tomcat/trunk/webapps/docs/config/http.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=740632&r1=740631&r2=740632&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Wed Feb  4 06:53:13 2009
@@ -513,6 +513,15 @@
            <code>-1</code> means unlimited, default is <code>200</code>. Set 
this value somewhere close to your maxThreads value.
         </p>
       </attribute>
+      <attribute name="maxKeepAliveRequests" required="false">
+        <p>The maximum number of HTTP requests which can be pipelined until
+        the connection is closed by the server. Setting this attribute to 1 
will
+        disable HTTP/1.0 keep-alive, as well as HTTP/1.1 keep-alive and
+        pipelining. Setting this to -1 will allow an unlimited amount of
+        pipelined or keep-alive HTTP requests.
+        If not specified, this attribute is set to 100.</p>
+      </attribute>
+
       <attribute name="socket.directBuffer" required="false">
         <p>(bool)Boolean value, whether to use direct ByteBuffers or java 
mapped ByteBuffers. Default is <code>false</code>
            <br/>When you are using direct buffers, make sure you allocate the 
appropriate amount of memory for the 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to