Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92534469 authored by Patrick Scott's avatar Patrick Scott
Browse files

Use case insensitive matching. 

Use the lowercase version of the protocol.

Bug: 2560217
Change-Id: Ibfadf4ba363968df9caf22c9ab36f666ee44d1db
parent 71106558

core/java/android/net/WebAddress.java

+3 −3
Original line number Diff line number Diff line
@@ -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);