Using Canonical URLs

3 files changed, 3 insertions, 3 deletions

diff --git a/src/gmdocument.c b/src/gmdocument.c
index 8832271a..c298f75b 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -181,7 +181,7 @@ static iRangecc addLink_GmDocument_(iGmDocument *d, iRangecc line, iGmLinkId *li
         iGmLink *link = new_GmLink();
         link->urlRange = capturedRange_RegExpMatch(&m, 1);
         setRange_String(&link->url, link->urlRange);
-        set_String(&link->url, absoluteUrl_String(&d->url, &link->url));
+        set_String(&link->url, canonicalUrl_String(absoluteUrl_String(&d->url, &link->url)));        
         /* Check the URL. */ {
             iUrl parts;
             init_Url(&parts, &link->url);
diff --git a/src/gmrequest.c b/src/gmrequest.c
index 1325c025..672614a2 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -526,7 +526,7 @@ void enableFilters_GmRequest(iGmRequest *d, iBool enable) {
 }
 
 void setUrl_GmRequest(iGmRequest *d, const iString *url) {
-    set_String(&d->url, urlFragmentStripped_String(url));
+    set_String(&d->url, canonicalUrl_String(urlFragmentStripped_String(url)));
     /* Encode hostname to Punycode here because we want to submit the Punycode domain name
        in the request. (TODO: Pending possible Gemini spec change.) */
     punyEncodeUrlHost_String(&d->url);
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 509933af..6a2173af 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1638,7 +1638,7 @@ static void updateFromCachedResponse_DocumentWidget_(iDocumentWidget *d, float n
 }
 
 static iBool updateFromHistory_DocumentWidget_(iDocumentWidget *d) {
-    const iRecentUrl *recent = findUrl_History(d->mod.history, canonicalUrl_String(d->mod.url));
+    const iRecentUrl *recent = findUrl_History(d->mod.history, d->mod.url);
     if (recent && recent->cachedResponse) {
         iChangeFlags(d->flags,
                      openedFromSidebar_DocumentWidgetFlag,