Author: kkolinko
Date: Wed Dec 10 04:27:45 2014
New Revision: 1644336
URL: http://svn.apache.org/r1644336
Log:
Clarify which of the two non-blocking java connector implementations is
selected by default.
Correct header in connectors comparison table (it labeled Nio[2] as blocking).
Partial backport of r1644331
Modified:
tomcat/tc8.0.x/trunk/webapps/docs/config/ajp.xml
tomcat/tc8.0.x/trunk/webapps/docs/config/http.xml
Modified: tomcat/tc8.0.x/trunk/webapps/docs/config/ajp.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/config/ajp.xml?rev=1644336&r1=1644335&r2=1644336&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/config/ajp.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/config/ajp.xml Wed Dec 10 04:27:45 2014
@@ -161,7 +161,7 @@
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
+ which uses an auto-switching mechanism to select either a Java NIO
based
connector or an APR/native based connector. If the
<code>PATH</code> (Windows) or <code>LD_LIBRARY_PATH</code> (on most
unix
systems) environment variables contain the Tomcat native library, the
@@ -172,9 +172,9 @@
<code>org.apache.coyote.ajp.AjpProtocol</code>
- blocking Java connector<br/>
<code>org.apache.coyote.ajp.AjpNioProtocol</code>
- - non blocking Java connector.<br/>
+ - non blocking Java NIO connector.<br/>
<code>org.apache.coyote.ajp.AjpNio2Protocol</code>
- - non blocking Java connector.<br/>
+ - non blocking Java NIO2 connector.<br/>
<code>org.apache.coyote.ajp.AjpAprProtocol</code>
- the APR/native connector.<br/>
Custom implementations may also be used.<br/>
@@ -750,8 +750,8 @@
<tr>
<th />
<th>Java Blocking Connector<br />BIO</th>
- <th>Java Nio Blocking Connector<br />NIO</th>
- <th>Java Nio2 Blocking Connector<br />NIO2</th>
+ <th>Java Nio Connector<br />NIO</th>
+ <th>Java Nio2 Connector<br />NIO2</th>
<th>APR/native Connector<br />APR</th>
</tr>
<tr>
Modified: tomcat/tc8.0.x/trunk/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/config/http.xml?rev=1644336&r1=1644335&r2=1644336&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/config/http.xml Wed Dec 10 04:27:45 2014
@@ -158,7 +158,7 @@
<attribute name="protocol" required="false">
<p>Sets the protocol to handle incoming traffic. The default value is
<code>HTTP/1.1</code> which uses an auto-switching mechanism to select
- either a non blocking Java based connector or an APR/native based
connector.
+ either a non blocking Java NIO based connector or an APR/native based
connector.
If the <code>PATH</code> (Windows) or <code>LD_LIBRARY_PATH</code> (on
most unix systems) environment variables contain the Tomcat native
library, the APR/native connector will be used. If the native library
@@ -170,9 +170,9 @@
<code>org.apache.coyote.http11.Http11Protocol</code> -
blocking Java connector<br/>
<code>org.apache.coyote.http11.Http11NioProtocol</code> -
- non blocking Java connector<br/>
+ non blocking Java NIO connector<br/>
<code>org.apache.coyote.http11.Http11Nio2Protocol</code> -
- non blocking Java connector<br/>
+ non blocking Java NIO2 connector<br/>
<code>org.apache.coyote.http11.Http11AprProtocol</code> -
the APR/native connector.<br/>
Custom implementations may also be used.<br/>
@@ -1400,8 +1400,8 @@
<tr>
<th />
<th>Java Blocking Connector<br />BIO</th>
- <th>Java Nio Blocking Connector<br />NIO</th>
- <th>Java Nio2 Blocking Connector<br />NIO2</th>
+ <th>Java Nio Connector<br />NIO</th>
+ <th>Java Nio2 Connector<br />NIO2</th>
<th>APR/native Connector<br />APR</th>
</tr>
<tr>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
