Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7c5c6076: Merge change 26640 into eclair

Browse Source 
Merge commit '7c5c6076ea5d02aabbb449b1341ec44d184d1316' into eclair-plus-aosp

* commit '7c5c6076ea5d02aabbb449b1341ec44d184d1316':
  Support IPv6 literal URLs, e.g., http://[2001:4860:b004::68]/ as per RFC 3896
This commit is contained in:
Lorenzo Colitti
2009-09-23 22:09:41 -07:00
committed by Android Git Automerger
parent a1e350eadc 7c5c6076ea
commit 4d5cd95542
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/net/WebAddress.java
View File

@@ -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%_]+)*|\\[[0-9a-fA-F:\\.]+\\])?" +
/* port */ "(?:\\:([0-9]+))?" +
/* path */ "(\\/?.*)?");