Author: markt
Date: Mon Jan 14 13:15:54 2013
New Revision: 1432909
URL: http://svn.apache.org/viewvc?rev=1432909&view=rev
Log:
Switch the AJP connector to NIO by default too
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
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=1432909&r1=1432908&r2=1432909&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Mon Jan 14
13:15:54 2013
@@ -207,7 +207,7 @@ public class Connector extends Lifecycle
* Defaults to the Coyote HTTP/1.1 protocolHandler.
*/
protected String protocolHandlerClassName =
- "org.apache.coyote.http11.Http11Protocol";
+ "org.apache.coyote.http11.Http11NioProtocol";
/**
@@ -540,7 +540,7 @@ public class Connector extends Lifecycle
|| "org.apache.coyote.http11.Http11AprProtocol".equals
(getProtocolHandlerClassName())) {
return "HTTP/1.1";
- } else if ("org.apache.coyote.ajp.AjpProtocol".equals
+ } else if ("org.apache.coyote.ajp.AjpNioProtocol".equals
(getProtocolHandlerClassName())
|| "org.apache.coyote.ajp.AjpAprProtocol".equals
(getProtocolHandlerClassName())) {
@@ -577,7 +577,7 @@ public class Connector extends Lifecycle
("org.apache.coyote.http11.Http11NioProtocol");
} else if ("AJP/1.3".equals(protocol)) {
setProtocolHandlerClassName
- ("org.apache.coyote.ajp.AjpProtocol");
+ ("org.apache.coyote.ajp.AjpNioProtocol");
} else if (protocol != null) {
setProtocolHandlerClassName(protocol);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
