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

Commit 68da044d authored by Steve Block's avatar Steve Block Committed by Android (Google) Code Review
Browse files

Merge "Updates WebAddress to ignore the colon after the host component of a... 

Merge "Updates WebAddress to ignore the colon after the host component of a URL if no port is specified"
parents 198e40dc 2257440f

core/java/android/net/WebAddress.java

+3 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ public class WebAddress { 
            /* scheme    */ "(?:(http|HTTP|https|HTTPS|file|FILE)\\:\\/\\/)?" +

            /* authority */ "(?:([-A-Za-z0-9$_.+!*'(),;?&=]+(?:\\:[-A-Za-z0-9$_.+!*'(),;?&=]+)?)@)?" +

            /* host      */ "([-" + GOOD_IRI_CHAR + "%_]+(?:\\.[-" + GOOD_IRI_CHAR + "%_]+)*|\\[[0-9a-fA-F:\\.]+\\])?" +

            /* port      */ "(?:\\:([0-9]+))?" +

            /* port      */ "(?:\\:([0-9]*))?" +

            /* path      */ "(\\/?[^#]*)?" +

            /* anchor    */ ".*");
@@ -85,7 +85,8 @@ public class WebAddress { 
            t = m.group(MATCH_GROUP_HOST);

            if (t != null) mHost = t;

            t = m.group(MATCH_GROUP_PORT);

            if (t != null) {

            if (t != null && t.length() > 0) {

                // The ':' character is not returned by the regex.

                try {

                    mPort = Integer.parseInt(t);

                } catch (NumberFormatException ex) {