Merge pull request google#6 from hellpf/master

IPv6 URL support
b95505017 · Sep 21, 2014 · 0609ab3 · 0609ab3
2 parents be0a44c + a5559c2
commit 0609ab3
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/src/main/java/com/github/nkzawa/engineio/client/Socket.java b/src/main/java/com/github/nkzawa/engineio/client/Socket.java
@@ -164,10 +164,19 @@ public Socket(URI uri, Options opts) {
 
     public Socket(Options opts) {
         if (opts.host != null) {
-            String[] pieces = opts.host.split(":");
-            opts.hostname = pieces[0];
-            if (pieces.length > 1) {
-                opts.port = Integer.parseInt(pieces[pieces.length - 1]);
+            boolean ipv6uri = opts.host.indexOf(']') != -1;
+            String[] pieces = ipv6uri ? opts.host.split("]:") : opts.host.split(":");
+            boolean ipv6 = (pieces.length > 2 || opts.host.indexOf("::") == -1);
+            if (ipv6) {
+                opts.hostname = opts.host;
+            } else {
+                opts.hostname = pieces[0];
+                if (ipv6uri) {
+                    opts.hostname = opts.hostname.substring(1);
+                }
+                if (pieces.length > 1) {
+                    opts.port = Integer.parseInt(pieces[pieces.length - 1]);
+                }
             }
         }