Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 90F48200C78 for ; Wed, 3 May 2017 18:31:14 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 8FC1E160BB5; Wed, 3 May 2017 16:31:14 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id DDD42160BA1 for ; Wed, 3 May 2017 18:31:13 +0200 (CEST) Received: (qmail 68207 invoked by uid 500); 3 May 2017 16:31:13 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 68145 invoked by uid 99); 3 May 2017 16:31:11 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 May 2017 16:31:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 101E6E04AA; Wed, 3 May 2017 16:31:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: clebertsuconic@apache.org To: commits@activemq.apache.org Date: Wed, 03 May 2017 16:31:11 -0000 Message-Id: <4f145611770c4490ab93112324a58c76@git.apache.org> In-Reply-To: <6ad793619894437d9667614edc9c5a6a@git.apache.org> References: <6ad793619894437d9667614edc9c5a6a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] activemq-artemis git commit: [ARTEMIS-1043] Support IPv6 in NettyConnector archived-at: Wed, 03 May 2017 16:31:14 -0000 [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 Authored: Wed May 3 09:50:40 2017 +0200 Committer: Clebert Suconic 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);