Author: markt
Date: Mon Sep 21 12:30:11 2015
New Revision: 1704287
URL: http://svn.apache.org/viewvc?rev=1704287&view=rev
Log:
Clean-up inspired by bug 58430
Modified:
tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml?rev=1704287&r1=1704286&r2=1704287&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml Mon Sep 21 12:30:11 2015
@@ -689,7 +689,7 @@
<subsection name="Connector Comparison">
- <p>Below is a small chart that shows how the connectors differentiate.</p>
+ <p>Below is a small chart that shows how the connectors differ.</p>
<source>
Java Blocking Connector Java Nio Blocking Connector
APR/native Connector
BIO NIO
APR
@@ -697,9 +697,9 @@
Tomcat Version 3.x onwards 7.x onwards
5.5.x onwards
Support Polling NO YES
YES
Polling Size N/A maxConnections
maxConnections
- Read Request Headers Blocking Sim Blocking
Blocking
- Read Request Body Blocking Sim Blocking
Blocking
- Write Response Blocking Sim Blocking
Blocking
+ Read Request Headers Blocking Blocking
Blocking
+ Read Request Body Blocking Blocking
Blocking
+ Write Response Blocking Blocking
Blocking
Wait for next Request Blocking Non Blocking
Non Blocking
Max Connections maxConnections maxConnections
maxConnections
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml?rev=1704287&r1=1704286&r2=1704287&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Mon Sep 21 12:30:11 2015
@@ -1316,7 +1316,7 @@
</subsection>
<subsection name="Connector Comparison">
- <p>Below is a small chart that shows how the connectors differentiate.</p>
+ <p>Below is a small chart that shows how the connectors differ.</p>
<source>
Java Blocking Connector Java Non Blocking Connector
APR/native Connector
BIO NIO
APR
@@ -1324,9 +1324,9 @@
Tomcat Version 3.x onwards 6.x onwards
5.5.x onwards
Support Polling NO YES
YES
Polling Size N/A maxConnections
maxConnections
- Read HTTP Request Blocking Non Blocking
Blocking
- Read HTTP Body Blocking Sim Blocking
Blocking
- Write HTTP Response Blocking Sim Blocking
Blocking
+ Read HTTP Request Blocking Blocking
Blocking
+ Read HTTP Body Blocking Blocking
Blocking
+ Write HTTP Response Blocking Blocking
Blocking
Wait for next Request Blocking Non Blocking
Non Blocking
SSL Support Java SSL Java SSL
OpenSSL
SSL Handshake Blocking Non blocking
Blocking
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
