Merge pull request #1827 from antimony/uri-builder-ipv6-host-compare-fix

Fix URIBuilder compare method for IPv6 hosts
pull/1835/head
Nikita Koksharov 6 years ago committed by GitHub
commit 8b0fe5516e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -70,10 +70,17 @@ public class URIBuilder {
throw new IOException(e);
}
}
private static String trimIpv6Brackets(String host) {
if (host.startsWith("[") && host.endsWith("]")) {
return host.substring(1, host.length() - 1);
}
return host;
}
public static boolean compare(InetSocketAddress entryAddr, URI addr) {
if (((entryAddr.getHostName() != null && entryAddr.getHostName().equals(addr.getHost()))
|| entryAddr.getAddress().getHostAddress().equals(addr.getHost()))
if (((entryAddr.getHostName() != null && entryAddr.getHostName().equals(trimIpv6Brackets(addr.getHost())))
|| entryAddr.getAddress().getHostAddress().equals(trimIpv6Brackets(addr.getHost())))
&& entryAddr.getPort() == addr.getPort()) {
return true;
}

Loading…
Cancel
Save