Author: kkolinko
Date: Wed Dec 10 03:52:39 2014
New Revision: 1644331
URL: http://svn.apache.org/r1644331
Log:
Correct several places that mention blocking connectors that have been removed
from Tomcat 9.
Modified:
tomcat/trunk/webapps/docs/aio.xml
tomcat/trunk/webapps/docs/config/ajp.xml
tomcat/trunk/webapps/docs/config/http.xml
Modified: tomcat/trunk/webapps/docs/aio.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/aio.xml?rev=1644331&r1=1644330&r2=1644331&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/aio.xml (original)
+++ tomcat/trunk/webapps/docs/aio.xml Wed Dec 10 03:52:39 2014
@@ -36,15 +36,8 @@
<section name="Introduction">
<p>
- With usage of APR or NIO APIs as the basis of its connectors, Tomcat is
- able to provide a number of extensions over the regular blocking IO
- as provided with support for the Servlet API.
- </p>
-
- <p>
- <b>IMPORTANT NOTE: Usage of these features requires using the APR or NIO
- HTTP connectors. The classic java.io HTTP connector and the AJP connectors
- do not support them.</b>
+ <b>IMPORTANT NOTE: Usage of these features requires using the
+ HTTP connectors. The AJP connectors do not support them.</b>
</p>
</section>
@@ -52,7 +45,8 @@
<section name="Asynchronous writes">
<p>
- When APR or NIO is enabled, Tomcat supports using sendfile to send large
static files.
+ When using HTTP connectors (based on APR or NIO/NIO2),
+ Tomcat supports using sendfile to send large static files.
These writes, as soon as the system load increases, will be performed
asynchronously in the most efficient way. Instead of sending a large
response using
blocking writes, it is possible to write content to a static file, and
write it
Modified: tomcat/trunk/webapps/docs/config/ajp.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/ajp.xml?rev=1644331&r1=1644330&r2=1644331&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/ajp.xml (original)
+++ tomcat/trunk/webapps/docs/config/ajp.xml Wed Dec 10 03:52:39 2014
@@ -161,20 +161,18 @@
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
native/APR connector will be used. If the native library cannot be
- found, the Java based connector will be used.<br/>
+ found, the Java NIO 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.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/>
@@ -745,8 +743,8 @@
<table class="defaultTable" style="text-align: center;">
<tr>
<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/trunk/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1644331&r1=1644330&r2=1644331&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Wed Dec 10 03:52:39 2014
@@ -158,21 +158,19 @@
<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 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
- cannot be found, the non blocking Java based connector will be used.
Note
+ cannot be found, the Java NIO based connector will be used. Note
that the APR/native 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/>
+ 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/>
@@ -1362,8 +1360,8 @@
<table class="defaultTable" style="text-align: center;">
<tr>
<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: [email protected]
For additional commands, e-mail: [email protected]
