From d9d3439617677d75ffde57d2860807fa7c14aff0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20K=C3=B6nig?= Date: Thu, 13 Dec 2012 17:43:59 +0100 Subject: [PATCH] Fixed parsing of URI with a IPv6-address Allowed ipv6-address in a uri like: http://[::1]:8080/repo.git Change-Id: Ia00a20f694b2e9314892df77f9b11f551bb1d34e Signed-off-by: Chris Aniszczyk --- .../tst/org/eclipse/jgit/transport/URIishTest.java | 2 +- org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/URIishTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/URIishTest.java index b5a753bbba..2202a91d3f 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/URIishTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/URIishTest.java @@ -822,7 +822,7 @@ public class URIishTest { String[] users = new String[] { "me", "l usr\\example.com", "lusr\\example" }; String[] passes = new String[] { "wtf", }; - String[] hosts = new String[] { "example.com", "1.2.3.4" }; + String[] hosts = new String[] { "example.com", "1.2.3.4", "[::1]" }; String[] ports = new String[] { "1234", "80" }; String[] paths = new String[] { "/", "/abc", "D:/x", "D:\\x" }; for (String[] test : tests) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java index 9befb92755..d11edfc63b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java @@ -87,7 +87,7 @@ public class URIish implements Serializable { * Part of a pattern which matches the host part of URIs. Defines one * capturing group containing the host name. */ - private static final String HOST_P = "([^\\\\/:]+)"; //$NON-NLS-1$ + private static final String HOST_P = "((?:[^\\\\/:]+)|(?:\\[[0-9a-f:]+\\]))"; /** * Part of a pattern which matches the optional port part of URIs. Defines -- 2.39.5