You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2018/05/01 00:56:38 UTC
[1/2] activemq-artemis git commit: ARTEMIS-1839 NettyConnector was
ignoring sniHost
Repository: activemq-artemis
Updated Branches:
refs/heads/master e2e5bdfec -> d5be6111e
ARTEMIS-1839 NettyConnector was ignoring sniHost
This is fixing org.apache.activemq.artemis.tests.integration.ssl.CoreClientOverOneWaySSLKerb5Test#testOneWaySSLWithGoodClientCipherSuite
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/c5b76bb3
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/c5b76bb3
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/c5b76bb3
Branch: refs/heads/master
Commit: c5b76bb34c9b76611776f67052e13ebd7afb527e
Parents: e2e5bdf
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Apr 30 20:39:42 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Apr 30 20:39:44 2018 -0400
----------------------------------------------------------------------
.../activemq/artemis/core/remoting/impl/netty/NettyConnector.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c5b76bb3/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
index c946f9c..65a63e5 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
@@ -625,7 +625,7 @@ public class NettyConnector extends AbstractConnector {
@Override
public SSLEngine run() {
if (verifyHost) {
- return context.createSSLEngine(host, port);
+ return context.createSSLEngine(sniHost != null ? sniHost : host, port);
} else {
return context.createSSLEngine();
}
[2/2] activemq-artemis git commit: This closes #2054
Posted by cl...@apache.org.
This closes #2054
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/d5be6111
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/d5be6111
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/d5be6111
Branch: refs/heads/master
Commit: d5be6111e5065b39b56555a1af77cf6ecca93556
Parents: e2e5bdf c5b76bb
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Apr 30 20:56:28 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Apr 30 20:56:28 2018 -0400
----------------------------------------------------------------------
.../activemq/artemis/core/remoting/impl/netty/NettyConnector.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------