Author: markt Date: Mon Mar 14 12:39:01 2011 New Revision: 1081350 URL: http://svn.apache.org/viewvc?rev=1081350&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50924 Clean-up HTTP comparison table
Modified: tomcat/trunk/webapps/docs/changelog.xml tomcat/trunk/webapps/docs/config/http.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1081350&r1=1081349&r2=1081350&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Mon Mar 14 12:39:01 2011 @@ -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> Modified: tomcat/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1081350&r1=1081349&r2=1081350&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/config/http.xml (original) +++ tomcat/trunk/webapps/docs/config/http.xml Mon Mar 14 12:39:01 2011 @@ -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> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org