From 4b7633d66743e0db3181778c3952f183f37b5f8c Mon Sep 17 00:00:00 2001 From: markt Date: Thu, 9 Apr 2009 09:53:34 +0000 Subject: [PATCH] Update the docs for the protocol attribute git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@763581 13f79535-47bb-0310-9956-ffa450edef68 --- webapps/docs/config/ajp.xml | 27 +++++++++++++-------------- webapps/docs/config/http.xml | 37 ++++++++++++++++++++++--------------- 2 files changed, 35 insertions(+), 29 deletions(-) diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml index a0dfb6463..b4053c799 100644 --- a/webapps/docs/config/ajp.xml +++ b/webapps/docs/config/ajp.xml @@ -113,20 +113,21 @@ -

Sets the protocol to handle incoming traffic. The default value is - AJP/1.3 and configures - org.apache.jk.server.JkCoyoteHandler the original blocking - Java connector by default.
- If the PATH(Windows) or LD_LIBRARY_PATH - (on most unix system) environment variables contain the Tomcat - native library, the native/APR connector will automatically be - configured instead.
+

Sets the protocol to handle incoming traffic. To configure an AJP + connector this must be specified. If no value for protocol is provided, + an HTTP connector rather than an AJP connector + will be configured.
+ The standard protocol value for an AJP connector is AJP/1.3 + which uses an auto-switching mechanism to select either a Java based + connector or an APR/native based connector. If the + PATH(Windows) or LD_LIBRARY_PATH (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.
To use an explicit protocol rather than rely on the auto-switching mechanism described above, the following values may be used:
- org.apache.jk.server.JkCoyoteHandler - - original blocking Java connector
org.apache.coyote.ajp.AjpProtocol - - new blocking Java connector that supports an executor
+ - blocking Java connector
org.apache.coyote.ajp.AjpAprProtocol - the APR/native connector.
Custom implementations may also be used.

@@ -261,9 +262,7 @@

A reference to the name in an Executor 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.

+ use the executor, and all the other thread attributes will be ignored.

 diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml index 133e6511b..2cc23e77c 100644 --- a/webapps/docs/config/http.xml +++ b/webapps/docs/config/http.xml @@ -116,21 +116,28 @@

Sets the protocol to handle incoming traffic. - The default value is HTTP/1.1 and configures the - org.apache.coyote.http11.Http11Protocol. This is the blocking Java connector.
- If the PATH(Windows) or LD_LIBRARY_PATH(on most unix system) - 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.
- Other values for this attribute are, but not limited to:
- org.apache.coyote.http11.Http11Protocol - same as HTTP/1.1
- org.apache.coyote.http11.Http11NioProtocol - non blocking Java connector
- org.apache.coyote.http11.Http11AprProtocol - the APR connector.
- Take a look at our Connector Comparison chart. - The configuration for both Java connectors are identical, both for http and https.
- For more information on the APR connector and APR specific SSL settings please - visit the APR documentation - + The default value is HTTP/1.1 which uses an auto-switching + mechanism to select either a blocking Java based connector or an + APR/native based connector. If the PATH(Windows) or + LD_LIBRARY_PATH (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.
+ To use an explicit protocol rather than rely on the auto-switching + mechanism described above, the following values may be used:
+ org.apache.coyote.http11.Http11Protocol - + blocking Java connector
+ org.apache.coyote.http11.Http11NioProtocol - + non blocking Java connector
+ org.apache.coyote.http11.Http11AprProtocol - + the APR/native connector.
+ Custom implementations may also be used.
+ Take a look at our Connector + Comparison chart. The configuration for both Java connectors is + identical, for http and https.
+ For more information on the APR connector and APR specific SSL settings + please visit the APR documentation

-- 2.11.0