Author: markt Date: Tue Nov 4 23:41:24 2014 New Revision: 1636780 URL: http://svn.apache.org/r1636780 Log: Tweak connector names to make it clearer if SSL has been enabled.
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1636780&r1=1636779&r2=1636780&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Tue Nov 4 23:41:24 2014 @@ -200,7 +200,11 @@ public class Http11AprProtocol extends A @Override protected String getNamePrefix() { - return ("http-apr"); + if (isSSLEnabled()) { + return ("https-apr"); + } else { + return ("http-apr"); + } } Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java?rev=1636780&r1=1636779&r2=1636780&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Tue Nov 4 23:41:24 2014 @@ -119,7 +119,11 @@ public class Http11Nio2Protocol extends @Override protected String getNamePrefix() { - return ("http-nio2"); + if (isSSLEnabled()) { + return ("https-nio2"); + } else { + return ("http-nio2"); + } } Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1636780&r1=1636779&r2=1636780&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Tue Nov 4 23:41:24 2014 @@ -140,7 +140,11 @@ public class Http11NioProtocol extends A @Override protected String getNamePrefix() { - return ("http-nio"); + if (isSSLEnabled()) { + return ("https-nio"); + } else { + return ("http-nio"); + } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org