svn commit: r1737195 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http11/

[markt]

Author: markt
Date: Thu Mar 31 08:46:22 2016
New Revision: 1737195

URL: http://svn.apache.org/viewvc?rev=1737195&view=rev
Log:
Include TLS implementation name in connector

Modified:
    tomcat/tc8.5.x/trunk/   (props changed)
    
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
    tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
    tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
    tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java

Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 31 08:46:22 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java?rev=1737195&r1=1737194&r2=1737195&view=diff
==============================================================================
--- 
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
 Thu Mar 31 08:46:22 2016
@@ -17,6 +17,7 @@
 package org.apache.coyote.http11;
 
 import org.apache.tomcat.util.net.AbstractJsseEndpoint;
+import org.apache.tomcat.util.net.openssl.OpenSSLImplementation;
 
 public abstract class AbstractHttp11JsseProtocol<S>
         extends AbstractHttp11Protocol<S> {
@@ -33,6 +34,13 @@ public abstract class AbstractHttp11Jsse
     }
 
 
+    protected String getSslImplemenationShortName() {
+        if 
(OpenSSLImplementation.class.getName().equals(getSslImplementationName())) {
+            return "openssl";
+        }
+        return "jsse";
+    }
+
     public String getSslImplementationName() { return 
getEndpoint().getSslImplementationName(); }
     public void setSslImplementationName(String s) { 
getEndpoint().setSslImplementationName(s); }
 

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1737195&r1=1737194&r2=1737195&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java 
Thu Mar 31 08:46:22 2016
@@ -63,7 +63,7 @@ public class Http11AprProtocol extends A
     @Override
     protected String getNamePrefix() {
         if (isSSLEnabled()) {
-            return ("https-apr");
+            return ("https-openssl-apr");
         } else {
             return ("http-apr");
         }

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java?rev=1737195&r1=1737194&r2=1737195&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java 
Thu Mar 31 08:46:22 2016
@@ -44,7 +44,7 @@ public class Http11Nio2Protocol extends
     @Override
     protected String getNamePrefix() {
         if (isSSLEnabled()) {
-            return ("https-nio2");
+            return ("https-" + getSslImplemenationShortName()+ "-nio2");
         } else {
             return ("http-nio2");
         }

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1737195&r1=1737194&r2=1737195&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java 
Thu Mar 31 08:46:22 2016
@@ -76,7 +76,7 @@ public class Http11NioProtocol extends A
     @Override
     protected String getNamePrefix() {
         if (isSSLEnabled()) {
-            return ("https-nio");
+            return ("https-" + getSslImplemenationShortName()+ "-nio");
         } else {
             return ("http-nio");
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org