am 09c49a8a: am 92534469: Use case insensitive matching.

Merge commit '09c49a8a6c3670126b2b9c477c5ac19cebdb9510' into kraken

* commit '09c49a8a6c3670126b2b9c477c5ac19cebdb9510':
  Use case insensitive matching.
This commit is contained in:
Patrick Scott
2010-03-31 11:04:50 -07:00
committed by Android Git Automerger

View File

@@ -54,12 +54,12 @@ public class WebAddress {
static final int MATCH_GROUP_PATH = 5;
static Pattern sAddressPattern = Pattern.compile(
/* scheme */ "(?:(http|HTTP|https|HTTPS|file|FILE)\\:\\/\\/)?" +
/* scheme */ "(?:(http|https|file)\\:\\/\\/)?" +
/* authority */ "(?:([-A-Za-z0-9$_.+!*'(),;?&=]+(?:\\:[-A-Za-z0-9$_.+!*'(),;?&=]+)?)@)?" +
/* host */ "([-" + GOOD_IRI_CHAR + "%_]+(?:\\.[-" + GOOD_IRI_CHAR + "%_]+)*|\\[[0-9a-fA-F:\\.]+\\])?" +
/* port */ "(?:\\:([0-9]*))?" +
/* path */ "(\\/?[^#]*)?" +
/* anchor */ ".*");
/* anchor */ ".*", Pattern.CASE_INSENSITIVE);
/** parses given uriString. */
public WebAddress(String address) throws ParseException {
@@ -79,7 +79,7 @@ public class WebAddress {
String t;
if (m.matches()) {
t = m.group(MATCH_GROUP_SCHEME);
if (t != null) mScheme = t;
if (t != null) mScheme = t.toLowerCase();
t = m.group(MATCH_GROUP_AUTHORITY);
if (t != null) mAuthInfo = t;
t = m.group(MATCH_GROUP_HOST);