Author: markt Date: Thu Apr 9 09:53:34 2009 New Revision: 763581 URL: http://svn.apache.org/viewvc?rev=763581&view=rev Log: Update the docs for the protocol attribute
Modified: tomcat/trunk/webapps/docs/config/ajp.xml tomcat/trunk/webapps/docs/config/http.xml Modified: tomcat/trunk/webapps/docs/config/ajp.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/ajp.xml?rev=763581&r1=763580&r2=763581&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/config/ajp.xml (original) +++ tomcat/trunk/webapps/docs/config/ajp.xml Thu Apr 9 09:53:34 2009 @@ -113,20 +113,21 @@ </attribute> <attribute name="protocol" required="false"> - <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/> + <p>Sets the protocol to handle incoming traffic. To configure an AJP + connector this must be specified. If no value for protocol is provided, + an <a href="http.html">HTTP connector</a> rather than an AJP connector + will be configured.<br/> + The standard protocol value for an AJP connector is <code>AJP/1.3</code> + which uses an auto-switching mechanism to select either a Java based + connector or an APR/native based connector. If the + <code>PATH(Windows)</code> or <code>LD_LIBRARY_PATH</code> (on most unix + system) environment variables contain the Tomcat native library, the + native/APR connector will be used. If the native library cannot be + found, the Java based connector will be used.<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/> + - blocking Java connector<br/> <code>org.apache.coyote.ajp.AjpAprProtocol</code> - the APR/native connector.<br/> Custom implementations may also be used.</p> @@ -261,9 +262,7 @@ <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. - This attribute is not supported by the original blocking Java - connector.</p> + use the executor, and all the other thread attributes will be ignored.</p> </attribute> <attribute name="keepAliveTimeout" required="false"> Modified: tomcat/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=763581&r1=763580&r2=763581&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/config/http.xml (original) +++ tomcat/trunk/webapps/docs/config/http.xml Thu Apr 9 09:53:34 2009 @@ -116,21 +116,28 @@ <attribute name="protocol" required="false"> <p> Sets the protocol to handle incoming traffic. - The default value is <code>HTTP/1.1</code> and configures the - <code>org.apache.coyote.http11.Http11Protocol</code>. This is the blocking Java connector.<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 APR connector - will automatically be configured. Please be advised that the APR connector has different - settings for HTTPS than the default Java connector.<br/> - Other values for this attribute are, but not limited to:<br/> - <code>org.apache.coyote.http11.Http11Protocol</code> - same as HTTP/1.1<br/> - <code>org.apache.coyote.http11.Http11NioProtocol</code> - non blocking Java connector<br/> - <code>org.apache.coyote.http11.Http11AprProtocol</code> - the APR connector.<br/> - Take a look at our <a href="#Connector Comparison">Connector Comparison</a> chart. - The configuration for both Java connectors are identical, both for http and https. <br/> - For more information on the APR connector and APR specific SSL settings please - visit the <a href="../apr.html">APR documentation</a> - + The default value is <code>HTTP/1.1</code> which uses an auto-switching + mechanism to select either a blocking Java based connector or an + APR/native based connector. If the <code>PATH(Windows)</code> or + <code>LD_LIBRARY_PATH</code> (on most unix system) environment variables + contain the Tomcat native library, the native/APR connector will be used. + If the native library cannot be found, the blocking Java based connector + will be used. Please be advised that the native/APR connector has + different settings for HTTPS than the Java connectors.<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.coyote.http11.Http11Protocol</code> - + blocking Java connector<br/> + <code>org.apache.coyote.http11.Http11NioProtocol</code> - + non blocking Java connector<br/> + <code>org.apache.coyote.http11.Http11AprProtocol</code> - + the APR/native connector.<br/> + Custom implementations may also be used.<br/> + Take a look at our <a href="#Connector Comparison">Connector + Comparison</a> chart. The configuration for both Java connectors is + identical, for http and https.<br/> + For more information on the APR connector and APR specific SSL settings + please visit the <a href="../apr.html">APR documentation</a> </p> </attribute> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org