Author: fhanik
Date: Thu Jun 22 09:03:32 2006
New Revision: 416408
URL: http://svn.apache.org/viewvc?rev=416408&view=rev
Log:
Reverted checkin, we can use a fully qualified class name inside of the protocol
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java?rev=416408&r1=416407&r2=416408&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java Thu
Jun 22 09:03:32 2006
@@ -623,9 +623,7 @@
}
if (apr) {
- if ("HTTP/1.1/NIO".equals(protocol)) {
-
setProtocolHandlerClassName("org.apache.coyote.http11.Http11NioProtocol");
- } else if ("HTTP/1.1".equals(protocol)) {
+ if ("HTTP/1.1".equals(protocol)) {
setProtocolHandlerClassName
("org.apache.coyote.http11.Http11AprProtocol");
} else if ("AJP/1.3".equals(protocol)) {
@@ -638,9 +636,7 @@
("org.apache.coyote.http11.Http11AprProtocol");
}
} else {
- if ("HTTP/1.1/NIO".equals(protocol)) {
-
setProtocolHandlerClassName("org.apache.coyote.http11.Http11NioProtocol");
- }else if ("HTTP/1.1".equals(protocol)) {
+ if ("HTTP/1.1".equals(protocol)) {
setProtocolHandlerClassName
("org.apache.coyote.http11.Http11Protocol");
} else if ("AJP/1.3".equals(protocol)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
