You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2016/03/30 13:39:11 UTC
svn commit: r1737105 - in /tomcat/trunk/java/org/apache/coyote/http11:
AbstractHttp11JsseProtocol.java Http11AprProtocol.java
Http11Nio2Protocol.java Http11NioProtocol.java
Author: markt
Date: Wed Mar 30 11:39:11 2016
New Revision: 1737105
URL: http://svn.apache.org/viewvc?rev=1737105&view=rev
Log:
Include TLS implementation name in connector
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
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/AbstractHttp11JsseProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java?rev=1737105&r1=1737104&r2=1737105&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java Wed Mar 30 11:39:11 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/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1737105&r1=1737104&r2=1737105&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Wed Mar 30 11:39:11 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/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java?rev=1737105&r1=1737104&r2=1737105&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Wed Mar 30 11:39:11 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/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1737105&r1=1737104&r2=1737105&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Wed Mar 30 11:39:11 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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1737105 - in
/tomcat/trunk/java/org/apache/coyote/http11: AbstractHttp11JsseProtocol.java
Http11AprProtocol.java Http11Nio2Protocol.java Http11NioProtocol.java
Posted by Mark Thomas <ma...@apache.org>.
On 30/03/2016 14:14, Rémy Maucherat wrote:
> 2016-03-30 6:41 GMT-05:00 Mark Thomas <ma...@apache.org>:
>
>> On 30/03/2016 12:39, markt@apache.org wrote:
>>> Author: markt
>>> Date: Wed Mar 30 11:39:11 2016
>>> New Revision: 1737105
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1737105&view=rev
>>> Log:
>>> Include TLS implementation name in connector
>>
>> I thought about adding -none- to the HTTP and AJP connectors for a
>> consistent format of:
>> protocol-tlsImplementation-connector-
>>
>> but decided not to since http- and ajp- imply no TLS implementation.
>>
>> I'm happy to add it in if folks think it is better top have a more
>> consistent format across all connectors.
>>
> BTW, there's a typo with nio2, it should be "-nio2".
Thanks. Fixed.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1737105 - in /tomcat/trunk/java/org/apache/coyote/http11:
AbstractHttp11JsseProtocol.java Http11AprProtocol.java Http11Nio2Protocol.java
Http11NioProtocol.java
Posted by Rémy Maucherat <re...@apache.org>.
2016-03-30 6:41 GMT-05:00 Mark Thomas <ma...@apache.org>:
> On 30/03/2016 12:39, markt@apache.org wrote:
> > Author: markt
> > Date: Wed Mar 30 11:39:11 2016
> > New Revision: 1737105
> >
> > URL: http://svn.apache.org/viewvc?rev=1737105&view=rev
> > Log:
> > Include TLS implementation name in connector
>
> I thought about adding -none- to the HTTP and AJP connectors for a
> consistent format of:
> protocol-tlsImplementation-connector-
>
> but decided not to since http- and ajp- imply no TLS implementation.
>
> I'm happy to add it in if folks think it is better top have a more
> consistent format across all connectors.
>
> BTW, there's a typo with nio2, it should be "-nio2".
Rémy
Re: svn commit: r1737105 - in
/tomcat/trunk/java/org/apache/coyote/http11: AbstractHttp11JsseProtocol.java
Http11AprProtocol.java Http11Nio2Protocol.java Http11NioProtocol.java
Posted by Mark Thomas <ma...@apache.org>.
On 30/03/2016 12:39, markt@apache.org wrote:
> Author: markt
> Date: Wed Mar 30 11:39:11 2016
> New Revision: 1737105
>
> URL: http://svn.apache.org/viewvc?rev=1737105&view=rev
> Log:
> Include TLS implementation name in connector
I thought about adding -none- to the HTTP and AJP connectors for a
consistent format of:
protocol-tlsImplementation-connector-
but decided not to since http- and ajp- imply no TLS implementation.
I'm happy to add it in if folks think it is better top have a more
consistent format across all connectors.
Mark
>
> Modified:
> tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
> 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/AbstractHttp11JsseProtocol.java
> URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java?rev=1737105&r1=1737104&r2=1737105&view=diff
> ==============================================================================
> --- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java (original)
> +++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java Wed Mar 30 11:39:11 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/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
> URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1737105&r1=1737104&r2=1737105&view=diff
> ==============================================================================
> --- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
> +++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Wed Mar 30 11:39:11 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/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
> URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java?rev=1737105&r1=1737104&r2=1737105&view=diff
> ==============================================================================
> --- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java (original)
> +++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Wed Mar 30 11:39:11 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/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
> URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1737105&r1=1737104&r2=1737105&view=diff
> ==============================================================================
> --- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
> +++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Wed Mar 30 11:39:11 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-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org