From 9e62bf7c90bc86e1f5946888cb272162507646ea Mon Sep 17 00:00:00 2001 From: fhanik Date: Thu, 22 Jun 2006 16:03:32 +0000 Subject: [PATCH] Reverted checkin, we can use a fully qualified class name inside of the protocol git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@416408 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/connector/Connector.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/java/org/apache/catalina/connector/Connector.java b/java/org/apache/catalina/connector/Connector.java index 2e355259d..2e32c8263 100644 --- a/java/org/apache/catalina/connector/Connector.java +++ b/java/org/apache/catalina/connector/Connector.java @@ -623,9 +623,7 @@ public class Connector } 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 @@ public class Connector ("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)) { -- 2.11.0