5 files changed, 25 insertions, 6 deletions

diff --git a/src/app.c b/src/app.c
index 3767495c..d06aeaac 100644
--- a/src/app.c
+++ b/src/app.c
@@ -634,11 +634,10 @@ iBool handleCommand_App(const char *cmd) {
         return iTrue;
     }
     else if (equal_Command(cmd, "open")) {
-        const iString *url = collect_String(newCStr_String(suffixPtr_Command(cmd, "url")));
+        const iString *url = collectNewCStr_String(suffixPtr_Command(cmd, "url"));
         iUrl parts;
         init_Url(&parts, url);
-        if (equalCase_Rangecc(parts.scheme, "http") ||
-            equalCase_Rangecc(parts.scheme, "https")) {
+        if (equalCase_Rangecc(parts.scheme, "http") || equalCase_Rangecc(parts.scheme, "https")) {
             openInDefaultBrowser_App(url);
             return iTrue;
         }
@@ -648,8 +647,9 @@ iBool handleCommand_App(const char *cmd) {
         }
         iHistory *history = history_DocumentWidget(doc);
         const iBool isHistory = argLabel_Command(cmd, "history") != 0;
+        int redirectCount = argLabel_Command(cmd, "redirect");
         if (!isHistory) {
-            if (argLabel_Command(cmd, "redirect")) {
+            if (redirectCount) {
                 replace_History(history, url);
             }
             else {
@@ -658,6 +658,7 @@ iBool handleCommand_App(const char *cmd) {
         }
         visitUrl_Visited(d->visited, url);
         setInitialScroll_DocumentWidget(doc, argfLabel_Command(cmd, "scroll"));
+        setRedirectCount_DocumentWidget(doc, redirectCount);
         setUrlFromCache_DocumentWidget(doc, url, isHistory);
     }
     else if (equal_Command(cmd, "document.request.cancelled")) {
diff --git a/src/gmutil.c b/src/gmutil.c
index 41f0dd20..131734b2 100644
--- a/src/gmutil.c
+++ b/src/gmutil.c
@@ -232,6 +232,11 @@ static const struct {
         "Redirect to Non-Gemini URL",
         "The server attempted to redirect us to a non-Gemini URL. Here is the link so you "
         "can open it manually if appropriate."} },
+    { tooManyRedirects_GmStatusCode,
+      { 0x27a0, /* dashed arrow */
+        "Too Many Redirects",
+        "You may be stuck in a redirection loop. The next redirected URL is below if you "
+        "want to continue manually."} },
     { temporaryFailure_GmStatusCode,
       { 0x1f50c, /* electric plug */
         "Temporary Failure",
diff --git a/src/gmutil.h b/src/gmutil.h
index dc73ce6e..2c017af4 100644
--- a/src/gmutil.h
+++ b/src/gmutil.h
@@ -34,6 +34,7 @@ enum iGmStatusCode {
     clientSide_GmStatusCode = -100,
     invalidRedirect_GmStatusCode,
     nonGeminiRedirect_GmStatusCode,
+    tooManyRedirects_GmStatusCode,
     invalidHeader_GmStatusCode,
     unsupportedMimeType_GmStatusCode,
     failedToOpenFile_GmStatusCode,
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 7f76a436..b954040a 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -183,6 +183,7 @@ struct Impl_DocumentWidget {
     int            certFlags;
     iDate          certExpiry;
     iString *      certSubject;
+    int            redirectCount;
     iBool          selecting;
     iRangecc       selectMark;
     iRangecc       foundMark;
@@ -221,6 +222,7 @@ void init_DocumentWidget(iDocumentWidget *d) {
     d->isRequestUpdated = iFalse;
     d->media            = new_ObjectList();
     d->doc              = new_GmDocument();
+    d->redirectCount    = 0;
     d->initNormScrollY  = 0;
     d->scrollY          = 0;
     d->smoothScroll     = 0;
@@ -512,6 +514,7 @@ static void showErrorPage_DocumentWidget_(iDocumentWidget *d, enum iGmStatusCode
     if (meta) {
         switch (code) {
             case nonGeminiRedirect_GmStatusCode:
+            case tooManyRedirects_GmStatusCode:
                 appendFormat_String(src, "\n=> %s\n", cstr_String(meta));
                 break;
             case failedToOpenFile_GmStatusCode:
@@ -750,6 +753,10 @@ void setInitialScroll_DocumentWidget(iDocumentWidget *d, float normScrollY) {
     d->initNormScrollY = normScrollY;
 }
 
+void setRedirectCount_DocumentWidget(iDocumentWidget *d, int count) {
+    d->redirectCount = count;
+}
+
 iBool isRequestOngoing_DocumentWidget(const iDocumentWidget *d) {
     return d->state == fetching_RequestState || d->state == receivedPartialResponse_RequestState;
 }
@@ -849,8 +856,12 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
                 else {
                     /* Only accept redirects that use gemini scheme. */
                     const iString *dstUrl = absoluteUrl_String(d->mod.url, meta_GmRequest(d->request));
-                    if (equalCase_Rangecc(urlScheme_String(dstUrl), "gemini")) {
-                        postCommandf_App("open redirect:1 url:%s", cstr_String(dstUrl));
+                    if (d->redirectCount >= 5) {
+                        showErrorPage_DocumentWidget_(d, tooManyRedirects_GmStatusCode, dstUrl);
+                    }
+                    else if (equalCase_Rangecc(urlScheme_String(dstUrl), "gemini")) {
+                        postCommandf_App(
+                            "open redirect:%d url:%s", d->redirectCount + 1, cstr_String(dstUrl));
                     }
                     else {
                         showErrorPage_DocumentWidget_(d, nonGeminiRedirect_GmStatusCode, dstUrl);
diff --git a/src/ui/documentwidget.h b/src/ui/documentwidget.h
index ec97a58a..5a3125af 100644
--- a/src/ui/documentwidget.h
+++ b/src/ui/documentwidget.h
@@ -45,5 +45,6 @@ const iString *     bookmarkTitle_DocumentWidget    (const iDocumentWidget *);
 void    setUrl_DocumentWidget           (iDocumentWidget *, const iString *url);
 void    setUrlFromCache_DocumentWidget  (iDocumentWidget *, const iString *url, iBool isFromCache);
 void    setInitialScroll_DocumentWidget (iDocumentWidget *, float normScrollY); /* set after content received */
+void    setRedirectCount_DocumentWidget (iDocumentWidget *, int count);
 
 void    updateSize_DocumentWidget       (iDocumentWidget *);