Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50924

Clean-up HTTP comparison table

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1081350 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 676049a..36522b2 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -79,6 +79,13 @@
       </add>
     </changelog>
   </subsection>
+  <subsection name="Web applications">
+    <changelog>
+      <fix>
+        <bug>50924</bug>: Clean-up HTTP connector comparison table. (markt)
+      </fix>
+    </changelog>
+  </subsection>"
   <subsection name="Other">
     <changelog>
       <update>

diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index 534ed4c..7d2c0da 100644 (file)
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -1154,17 +1154,18 @@
 
     <p>Below is a small chart that shows how the connectors differentiate.</p>
     <source>
-                  Java Blocking Connector       Java Nio Blocking Connector       APR Connector
-    Classname         Http11Protocol                  Http11NioProtocol         Http11AprProtocol
-    Tomcat Version   3.x 4.x 5.x 6.x                       6.x                     5.5.x 6.x
-    Support Polling         NO                             YES                        YES
-    Polling Size           N/A                   Unlimited - Restricted by mem        Unlimited - Configurable
-    Read HTTP Request     Blocking                     Non Blocking                   Blocking
-    Read HTTP Body        Blocking                     Sim Blocking                   Blocking
-    Write HTTP Response   Blocking                     Sim Blocking                   Blocking
-    SSL Support           Java SSL                     Java SSL                       OpenSSL
-    SSL Handshake         Blocking                     Non blocking                   Blocking
-    Max Connections       maxThreads                   See polling size               See polling size
+                       Java Blocking Connector    Java Nio Blocking Connector      APR/native Connector
+                                 BIO                          NIO                          APR
+    Classname              Http11Protocol              Http11NioProtocol            Http11AprProtocol
+    Tomcat Version           3.x onwards                  6.x onwards                 5.5.x onwards
+    Support Polling              NO                           YES                          YES
+    Polling Size                 N/A             Unlimited - Restricted by mem   Unlimited - Configurable
+    Read HTTP Request         Blocking                   Non Blocking                    Blocking
+    Read HTTP Body            Blocking                   Sim Blocking                    Blocking
+    Write HTTP Response       Blocking                   Sim Blocking                    Blocking
+    SSL Support               Java SSL                     Java SSL                      OpenSSL
+    SSL Handshake             Blocking                   Non blocking                    Blocking
+    Max Connections          maxThreads                See polling size              See polling size
     
     
     </source>