Merge change 605

* changes: Add '_' to the allowable characters in a host name.
2009-04-28 04:56:52 -07:00
parent f3c06bb8b6 135e24c294
commit b4ec401085
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/net/WebAddress.java
+++ b/core/java/android/net/WebAddress.java
@@ -54,7 +54,7 @@ public class WebAddress {
    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%_]+)*)?" +
            /* port      */ "(?:\\:([0-9]+))?" +
            /* path      */ "(\\/?.*)?");