Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46923

Fully document protocol options for AJP.

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

diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml
index f78e015..a0dfb64 100644 (file)
--- a/webapps/docs/config/ajp.xml
+++ b/webapps/docs/config/ajp.xml
@@ -113,8 +113,23 @@
     </attribute>
 
     <attribute name="protocol" required="false">
-      <p>This attribute value must be <code>AJP/1.3</code> to use the AJP
-      handler.</p>
+      <p>Sets the protocol to handle incoming traffic. The default value is
+        <code>AJP/1.3</code> and configures
+        <code>org.apache.jk.server.JkCoyoteHandler</code> the original blocking
+        Java connector by default.<br/>
+        If the <code>PATH(Windows)</code> or <code>LD_LIBRARY_PATH
+        (on most unix system)</code> environment variables contain the Tomcat
+        native library, the native/APR connector will automatically be
+        configured instead.<br/>
+        To use an explicit protocol rather than rely on the auto-switching
+        mechanism described above, the following values may be used:<br/>
+        <code>org.apache.jk.server.JkCoyoteHandler</code>
+        - original blocking Java connector<br/>
+        <code>org.apache.coyote.ajp.AjpProtocol</code>
+        - new blocking Java connector that supports an executor<br/>
+        <code>org.apache.coyote.ajp.AjpAprProtocol</code>
+        - the APR/native connector.<br/>
+      Custom implementations may also be used.</p>
     </attribute>
 
     <attribute name="proxyName" required="false">
@@ -196,14 +211,14 @@
 
   </subsection>
 
-  <subsection name="Standard Implementation">
+  <subsection name="Standard Implementations">
 
   <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>
+  <p><strong>These implementations support the AJP 1.3 protocol.</strong></p>
 
-  <p>It supports the following additional attributes (in addition to the
+  <p>They support the following additional attributes (in addition to the
   common attributes listed above):</p>
 
   <attributes>
@@ -246,7 +261,9 @@
     <attribute name="executor" required="false">
       <p>A reference to the name in an <a href="executor.html">Executor</a> element.
          If this attribute is enabled, and the named executor exists, the connector will
-         use the executor, and all the other thread attributes will be ignored.</p>
+         use the executor, and all the other thread attributes will be ignored.
+         This attribute is not supported by the original blocking Java
+         connector.</p>
     </attribute>
 
     <attribute name="keepAliveTimeout" required="false">