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

Merge "Enhance URL regular expression to match more Unicode chars."

Browse Source
This commit is contained in:
Shimeng (Simon) Wang
2010-02-16 10:49:37 -08:00
committed by Android (Google) Code Review
parent 3d0ff09e35 51c02dbf75
commit e8cb5ab7c0
4 changed files with 61 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,8 @@
package android.net;
import static com.android.common.Patterns.GOOD_IRI_CHAR;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -54,7 +56,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%_]+)*|\\[[0-9a-fA-F:\\.]+\\])?" +
/* host */ "([-" + GOOD_IRI_CHAR + "%_]+(?:\\.[-" + GOOD_IRI_CHAR + "%_]+)*|\\[[0-9a-fA-F:\\.]+\\])?" +
/* port */ "(?:\\:([0-9]+))?" +
/* path */ "(\\/?.*)?");