From ff79edc70395a749c9e432ed8f0c169fab717f01 Mon Sep 17 00:00:00 2001 From: markt Date: Mon, 14 Mar 2011 12:39:01 +0000 Subject: [PATCH] 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 --- webapps/docs/changelog.xml | 7 +++++++ webapps/docs/config/http.xml | 23 ++++++++++++----------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 676049a20..36522b2ed 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -79,6 +79,13 @@ + + + + 50924: Clean-up HTTP connector comparison table. (markt) + + + " diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml index 534ed4ce0..7d2c0daf0 100644 --- a/webapps/docs/config/http.xml +++ b/webapps/docs/config/http.xml @@ -1154,17 +1154,18 @@

Below is a small chart that shows how the connectors differentiate.

- 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 -- 2.11.0