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 2017/05/03 16:31:10 UTC
[1/2] activemq-artemis git commit: This closes #1244
Repository: activemq-artemis
Updated Branches:
refs/heads/master 5391d42e4 -> 354937700
This closes #1244
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/35493770
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/35493770
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/35493770
Branch: refs/heads/master
Commit: 3549377000301f22a2053f63cb05b85e35f3d664
Parents: 5391d42 15b9133
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed May 3 12:31:00 2017 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed May 3 12:31:00 2017 -0400
----------------------------------------------------------------------
.../artemis/core/remoting/impl/netty/NettyConnector.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: [ARTEMIS-1043] Support IPv6 in
NettyConnector
Posted by cl...@apache.org.
[ARTEMIS-1043] Support IPv6 in NettyConnector
Wrap the host added to the HTTP request headers with IPV6Util.encloseHost
to ensure that load balancers that reads the header will have a valid
IPv6 address.
JIRA: https://issues.apache.org/jira/browse/ARTEMIS-1043
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/15b91333
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/15b91333
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/15b91333
Branch: refs/heads/master
Commit: 15b913333f039411182aed2b474ebcf899fef03e
Parents: 5391d42
Author: Jeff Mesnil <jm...@gmail.com>
Authored: Wed May 3 09:50:40 2017 +0200
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed May 3 12:31:00 2017 -0400
----------------------------------------------------------------------
.../artemis/core/remoting/impl/netty/NettyConnector.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/15b91333/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 b856421..f5b5e56 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
@@ -694,9 +694,10 @@ public class NettyConnector extends AbstractConnector {
if (sslEnabled) {
scheme = "https";
}
- URI uri = new URI(scheme, null, IPV6Util.encloseHost(host), port, null, null, null);
+ String ipv6Host = IPV6Util.encloseHost(host);
+ URI uri = new URI(scheme, null, ipv6Host, port, null, null, null);
HttpRequest request = new DefaultHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, uri.getRawPath());
- request.headers().set(HttpHeaderNames.HOST, host);
+ request.headers().set(HttpHeaderNames.HOST, ipv6Host);
request.headers().set(HttpHeaderNames.UPGRADE, ACTIVEMQ_REMOTING);
request.headers().set(HttpHeaderNames.CONNECTION, HttpHeaderNames.UPGRADE);
final String serverName = ConfigurationHelper.getStringProperty(TransportConstants.ACTIVEMQ_SERVER_NAME, null, configuration);