remm 2005/04/06 08:54:05
Modified: webapps/docs/config http.xml ajp.xml
Log:
- Fix AJP documentation error about connection timeout (no timeout by
default).
Revision Changes Path
1.21 +2 -4 jakarta-tomcat-catalina/webapps/docs/config/http.xml
Index: http.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/http.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- http.xml 22 Nov 2004 20:18:30 -0000 1.20
+++ http.xml 6 Apr 2005 15:54:05 -0000 1.21
@@ -158,10 +158,8 @@
<subsection name="Standard Implementation">
- <p>The standard implementation of the <strong>HTTP
- Connector</strong> is
- <strong>org.apache.coyote.tomcat5.CoyoteConnector</strong>.
- It supports the following additional attributes (in addition to the
+ <p>
+ HTTP supports the following additional attributes (in addition to the
common attributes listed above):</p>
<attributes>
1.13 +8 -9 jakarta-tomcat-catalina/webapps/docs/config/ajp.xml
Index: ajp.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/ajp.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ajp.xml 13 Dec 2004 14:25:05 -0000 1.12
+++ ajp.xml 6 Apr 2005 15:54:05 -0000 1.13
@@ -159,9 +159,8 @@
<subsection name="Standard Implementation">
- <p>The standard implementation of <strong>AJP Connector</strong> is
- <strong>org.apache.coyote.tomcat5.CoyoteConnector</strong>, but you
- must specify the protocol attribute (see below).</p>
+ <p>To use AJP, you
+ must specify the protocol attribute (see above).</p>
<p><strong>This implementation supports the AJP 1.3 protocol.</strong></p>
@@ -186,6 +185,12 @@
value is 10.</p>
</attribute>
+ <attribute name="connectionTimeout" required="false">
+ <p>The number of milliseconds this <strong>Connector</strong> will
wait,
+ after accepting a connection, for the request URI line to be
+ presented. The default value is infinite (i.e. no timeout).</p>
+ </attribute>
+
<attribute name="minProcessors" required="false">
<strong>deprecated</strong>
<p>The minimum number of processors to start at initialization time.
@@ -239,12 +244,6 @@
circumstances. This is set to <code>true</code> by default.</p>
</attribute>
- <attribute name="soTimeout" required="false">
- <p>The number of milliseconds this <strong>Connector</strong> will
wait,
- after accepting a connection, for the request URI line to be
- presented. The default value is 60000 (i.e. 60 seconds).</p>
- </attribute>
-
<attribute name="tomcatAuthentication" required="false">
<p>If set to <code>true</code>, the authetication will be done in
Tomcat.
Otherwise, the authenticated principal will be propagated from the
native
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
