Author: markt Date: Wed Mar 30 10:40:54 2016 New Revision: 1737095 URL: http://svn.apache.org/viewvc?rev=1737095&view=rev Log: No need to specify default format Better format for the comparison table headings Align HTTP and AJP row descriptions Be more explicit about Headers and Bodies
Modified: tomcat/tc8.5.x/trunk/webapps/docs/config/ajp.xml tomcat/tc8.5.x/trunk/webapps/docs/config/http.xml Modified: tomcat/tc8.5.x/trunk/webapps/docs/config/ajp.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/config/ajp.xml?rev=1737095&r1=1737094&r2=1737095&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/webapps/docs/config/ajp.xml (original) +++ tomcat/tc8.5.x/trunk/webapps/docs/config/ajp.xml Wed Mar 30 10:40:54 2016 @@ -759,60 +759,60 @@ <table class="defaultTable" style="text-align: center;"> <tr> <th /> - <th>Java Nio Connector<br />NIO</th> - <th>Java Nio2 Connector<br />NIO2</th> - <th>APR/native Connector<br />APR</th> + <th style="text-align: center;">Java Nio Connector<br />NIO</th> + <th style="text-align: center;">Java Nio2 Connector<br />NIO2</th> + <th style="text-align: center;">APR/native Connector<br />APR</th> </tr> <tr> - <th style="text-align: left;">Classname</th> + <th>Classname</th> <td><code class="noHighlight">AjpNioProtocol</code></td> <td><code class="noHighlight">AjpNio2Protocol</code></td> <td><code class="noHighlight">AjpAprProtocol</code></td> </tr> <tr> - <th style="text-align: left;">Tomcat Version</th> + <th>Tomcat Version</th> <td>7.x onwards</td> <td>8.x onwards</td> <td>5.5.x onwards</td> </tr> <tr> - <th style="text-align: left;">Support Polling</th> + <th>Support Polling</th> <td>YES</td> <td>YES</td> <td>YES</td> </tr> <tr> - <th style="text-align: left;">Polling Size</th> + <th>Polling Size</th> <td><code class="noHighlight">maxConnections</code></td> <td><code class="noHighlight">maxConnections</code></td> <td><code class="noHighlight">maxConnections</code></td> </tr> <tr> - <th style="text-align: left;">Read Request Headers</th> + <th>Read Request Headers</th> <td>Blocking</td> <td>Blocking</td> <td>Blocking</td> </tr> <tr> - <th style="text-align: left;">Read Request Body</th> + <th>Read Request Body</th> <td>Blocking</td> <td>Blocking</td> <td>Blocking</td> </tr> <tr> - <th style="text-align: left;">Write Response</th> + <th>Write Response Headers and Body</th> <td>Blocking</td> <td>Blocking</td> <td>Blocking</td> </tr> <tr> - <th style="text-align: left;">Wait for next Request</th> + <th>Wait for next Request</th> <td>Non Blocking</td> <td>Non Blocking</td> <td>Non Blocking</td> </tr> <tr> - <th style="text-align: left;">Max Connections</th> + <th>Max Connections</th> <td><code class="noHighlight">maxConnections</code></td> <td><code class="noHighlight">maxConnections</code></td> <td><code class="noHighlight">maxConnections</code></td> Modified: tomcat/tc8.5.x/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/config/http.xml?rev=1737095&r1=1737094&r2=1737095&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/webapps/docs/config/http.xml (original) +++ tomcat/tc8.5.x/trunk/webapps/docs/config/http.xml Wed Mar 30 10:40:54 2016 @@ -1673,72 +1673,72 @@ <table class="defaultTable" style="text-align: center;"> <tr> <th /> - <th>Java Nio Connector<br />NIO</th> - <th>Java Nio2 Connector<br />NIO2</th> - <th>APR/native Connector<br />APR</th> + <th style="text-align: center;">Java Nio Connector<br />NIO</th> + <th style="text-align: center;">Java Nio2 Connector<br />NIO2</th> + <th style="text-align: center;">APR/native Connector<br />APR</th> </tr> <tr> - <th style="text-align: left;">Classname</th> + <th>Classname</th> <td><code class="noHighlight">Http11NioProtocol</code></td> <td><code class="noHighlight">Http11Nio2Protocol</code></td> <td><code class="noHighlight">Http11AprProtocol</code></td> </tr> <tr> - <th style="text-align: left;">Tomcat Version</th> + <th>Tomcat Version</th> <td>6.x onwards</td> <td>8.x onwards</td> <td>5.5.x onwards</td> </tr> <tr> - <th style="text-align: left;">Support Polling</th> + <th>Support Polling</th> <td>YES</td> <td>YES</td> <td>YES</td> </tr> <tr> - <th style="text-align: left;">Polling Size</th> + <th>Polling Size</th> <td><code class="noHighlight">maxConnections</code></td> <td><code class="noHighlight">maxConnections</code></td> <td><code class="noHighlight">maxConnections</code></td> </tr> <tr> - <th style="text-align: left;">Read HTTP Request</th> + <th>Read Request Headers</th> <td>Non Blocking</td> <td>Non Blocking</td> <td>Non Blocking</td> </tr> <tr> - <th style="text-align: left;">Read HTTP Body</th> + <th>Read Request Body</th> <td>Blocking</td> <td>Blocking</td> <td>Blocking</td> </tr> <tr> - <th style="text-align: left;">Write HTTP Response</th> + <th>Write Response Headers and Body</th> <td>Blocking</td> <td>Blocking</td> <td>Blocking</td> </tr> <tr> - <th style="text-align: left;">Wait for next Request</th> + <th>Wait for next Request</th> <td>Non Blocking</td> <td>Non Blocking</td> <td>Non Blocking</td> </tr> <tr> - <th style="text-align: left;">SSL Support</th> + <th>SSL Support</th> <td>Java SSL or OpenSSL</td> <td>Java SSL or OpenSSL</td> <td>OpenSSL</td> </tr> <tr> - <th style="text-align: left;">SSL Handshake</th> + <th>SSL Handshake</th> <td>Non blocking</td> <td>Non blocking</td> <td>Blocking</td> </tr> <tr> - <th style="text-align: left;">Max Connections</th> + <th>Max Connections</th> <td><code class="noHighlight">maxConnections</code></td> <td><code class="noHighlight">maxConnections</code></td> <td><code class="noHighlight">maxConnections</code></td> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org