diff options
| author | 2009-04-28 04:56:52 -0700 | |
|---|---|---|
| committer | 2009-04-28 04:56:52 -0700 | |
| commit | b4ec40108552b5fd9c48c0c7f5a61addeaae797c (patch) | |
| tree | d8cf9f26ed2082585c11b59f4d1d6c05e3155f46 | |
| parent | f3c06bb8b66cb91a1b9c3a0c7b8f73e80819a232 (diff) | |
| parent | 135e24c294884e009766e5b269424fcd07d83646 (diff) | |
Merge change 605
* changes:
Add '_' to the allowable characters in a host name.
| -rw-r--r-- | core/java/android/net/WebAddress.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/net/WebAddress.java b/core/java/android/net/WebAddress.java index f4a2a6a94307..f6159def812b 100644 --- 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 */ "(\\/?.*)?"); |