commit 7c5c6076ea5d02aabbb449b1341ec44d184d1316
author Android (Google) Code Review <android-gerrit@google.com> Thu Sep 24 01:03:58 2009 -0400
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 24 01:03:58 2009 -0400
tree 129ab062ff7fa68271be7bf04e5338bbb5a4fcc0
parent b89cfb0f9db2b1a4655c5e78e5c57855b5a78ee9
parent 78cf04f6585a363a0c9650a3ddc66febe2c6cc80

Merge change 26640 into eclair

* changes:
  Support IPv6 literal URLs, e.g., http://[2001:4860:b004::68]/ as per RFC 3896 section 3.2.2.

core/java/android/net/WebAddress.java

diff --git a/core/java/android/net/WebAddress.java b/core/java/android/net/WebAddress.java
index f6159de..f4ae66a 100644
--- a/core/java/android/net/WebAddress.java
+++ b/core/java/android/net/WebAddress.java
@@ -54,7 +54,7 @@
     static Pattern sAddressPattern = Pattern.compile(
             /* scheme    */ "(?:(http|HTTP|https|HTTPS|file|FILE)\\:\\/\\/)?" +
             /* authority */ "(?:([-A-Za-z0-9$_.+!*'(),;?&=]+(?:\\:[-A-Za-z0-9$_.+!*'(),;?&=]+)?)@)?" +
-            /* host      */ "([-A-Za-z0-9%_]+(?:\\.[-A-Za-z0-9%_]+)*)?" +
+            /* host      */ "([-A-Za-z0-9%_]+(?:\\.[-A-Za-z0-9%_]+)*|\\[[0-9a-fA-F:\\.]+\\])?" +
             /* port      */ "(?:\\:([0-9]+))?" +
             /* path      */ "(\\/?.*)?");