You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by fh...@apache.org on 2012/07/06 09:01:22 UTC
svn commit: r1358057 - in /tomcat/trunk:
java/org/apache/catalina/connector/Connector.java
webapps/docs/changelog.xml webapps/docs/config/http.xml
Author: fhanik
Date: Fri Jul 6 07:01:22 2012
New Revision: 1358057
URL: http://svn.apache.org/viewvc?rev=1358057&view=rev
Log:
Change the default connector for Tomcat 8
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/http.xml
Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1358057&r1=1358056&r2=1358057&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Fri Jul 6 07:01:22 2012
@@ -551,7 +551,7 @@ public class Connector extends Lifecycle
*/
public String getProtocol() {
- if ("org.apache.coyote.http11.Http11Protocol".equals
+ if ("org.apache.coyote.http11.Http11NioProtocol".equals
(getProtocolHandlerClassName())
|| "org.apache.coyote.http11.Http11AprProtocol".equals
(getProtocolHandlerClassName())) {
@@ -590,7 +590,7 @@ public class Connector extends Lifecycle
} else {
if ("HTTP/1.1".equals(protocol)) {
setProtocolHandlerClassName
- ("org.apache.coyote.http11.Http11Protocol");
+ ("org.apache.coyote.http11.Http11NioProtocol");
} else if ("AJP/1.3".equals(protocol)) {
setProtocolHandlerClassName
("org.apache.coyote.ajp.AjpProtocol");
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1358057&r1=1358056&r2=1358057&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jul 6 07:01:22 2012
@@ -85,6 +85,10 @@
<subsection name="Coyote">
<changelog>
<scode>
+ The default connector is now the Java NIO connector
+ even when specifying HTTP/1.1 as protocol (fhanik)
+ </scode>
+ <scode>
Update default value of pollerThreadCount for the NIO connector.
The new default value will never go above 2 regardless of
available processors. (fhanik)
Modified: tomcat/trunk/webapps/docs/config/http.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1358057&r1=1358056&r2=1358057&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Fri Jul 6 07:01:22 2012
@@ -157,7 +157,7 @@
<attribute name="protocol" required="false">
<p>Sets the protocol to handle incoming traffic. The default value is
<code>HTTP/1.1</code> which uses an auto-switching mechanism to select
- either a blocking Java based connector or an APR/native based connector.
+ either a non blocking Java based connector or an APR/native based connector.
If the <code>PATH</code> (Windows) or <code>LD_LIBRARY_PATH</code> (on
most unix systems) environment variables contain the Tomcat native
library, the APR/native connector will be used. If the native library
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org