1 files changed, 19 insertions, 31 deletions

diff --git a/src/gmutil.c b/src/gmutil.c
index 369aaaf1..79268dd4 100644
--- a/src/gmutil.c
+++ b/src/gmutil.c
@@ -35,41 +35,29 @@ void init_Url(iUrl *d, const iString *text) {
         d->path   = (iRangecc){ cstr + 7, constEnd_String(text) };
         return;
     }
-    static iRegExp *absoluteUrlPattern_;
-    static iRegExp *relativeUrlPattern_;
-    if (!absoluteUrlPattern_) {
-        absoluteUrlPattern_ = new_RegExp("([a-z]+:)?(//[^/:?]*)(:[0-9]+)?([^?]*)(\\?.*)?",
-                                         caseInsensitive_RegExpOption);
+    static iRegExp *urlPattern_;
+    static iRegExp *authPattern_;
+    if (!urlPattern_) {
+        urlPattern_  = new_RegExp("^(([^:/?#]+):)?(//([^/?#]*))?"
+                                 "([^?#]*)(\\?([^#]*))?(#(.*))?",
+                                 caseInsensitive_RegExpOption);
+        authPattern_ = new_RegExp("([^:]+)(:([0-9]+))?", caseInsensitive_RegExpOption);
     }
+    iZap(*d);
     iRegExpMatch m;
     init_RegExpMatch(&m);
-    if (matchString_RegExp(absoluteUrlPattern_, text, &m)) {
-        d->scheme = capturedRange_RegExpMatch(&m, 1);
-        d->host   = capturedRange_RegExpMatch(&m, 2);
-        if (!isEmpty_Range(&d->host)) {
-            d->host.start += 2; /* skip the double slash */
+    if (matchString_RegExp(urlPattern_, text, &m)) {
+        d->scheme = capturedRange_RegExpMatch(&m, 2);
+        d->host   = capturedRange_RegExpMatch(&m, 4);
+        d->port   = (iRangecc){ d->host.end, d->host.end };
+        d->path   = capturedRange_RegExpMatch(&m, 5);
+        d->query  = capturedRange_RegExpMatch(&m, 6);
+        /* Check if the authority contains a port. */
+        init_RegExpMatch(&m);
+        if (matchRange_RegExp(authPattern_, d->host, &m)) {
+            d->host = capturedRange_RegExpMatch(&m, 1);
+            d->port = capturedRange_RegExpMatch(&m, 3);
         }
-        d->port = capturedRange_RegExpMatch(&m, 3);
-        if (!isEmpty_Range(&d->port)) {
-            d->port.start++; /* omit the colon */
-        }
-        d->path  = capturedRange_RegExpMatch(&m, 4);
-        d->query = capturedRange_RegExpMatch(&m, 5);
-    }
-    else {
-        /* Must be a relative path. */
-        iZap(*d);
-        if (!relativeUrlPattern_) {
-            relativeUrlPattern_ = new_RegExp("([a-z]+:)?([^?]*)(\\?.*)?", 0);
-        }
-        if (matchString_RegExp(relativeUrlPattern_, text, &m)) {
-            d->scheme = capturedRange_RegExpMatch(&m, 1);
-            d->path   = capturedRange_RegExpMatch(&m, 2);
-            d->query  = capturedRange_RegExpMatch(&m, 3);
-        }
-    }
-    if (!isEmpty_Range(&d->scheme)) {
-        d->scheme.end--; /* omit the colon */
     }
 }