Cancel GmRequest from the main thread

Doing it in the SDL timer thread causes mutex lockups.

3 files changed, 12 insertions, 2 deletions

diff --git a/src/gmrequest.c b/src/gmrequest.c
index 9591885a..7cc8b897 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -120,12 +120,16 @@ void setUrl_GmRequest(iGmRequest *d, const iString *url) {
 }
 
 static uint32_t timedOutWhileReceivingBody_GmRequest_(uint32_t interval, void *obj) {
-    iGmRequest *d = obj;
-    cancel_TlsRequest(d->req);
+    /* Note: Called from SDL's timer thread. */
+    postCommandf_App("gmrequest.timeout request:%p", obj);
     iUnused(interval);
     return 0;
 }
 
+void cancel_GmRequest(iGmRequest *d) {
+    cancel_TlsRequest(d->req);
+}
+
 static void restartTimeout_GmRequest_(iGmRequest *d) {
     /* Note: `d` is currently locked. */
     if (d->timeoutId) {
diff --git a/src/gmrequest.h b/src/gmrequest.h
index c7d9d738..3b2ee3b3 100644
--- a/src/gmrequest.h
+++ b/src/gmrequest.h
@@ -39,6 +39,7 @@ iDeclareAudienceGetter(GmRequest, finished)
 
 void                setUrl_GmRequest            (iGmRequest *, const iString *url);
 void                submit_GmRequest            (iGmRequest *);
+void                cancel_GmRequest            (iGmRequest *);
 
 iBool               isFinished_GmRequest        (const iGmRequest *);
 enum iGmStatusCode  status_GmRequest            (const iGmRequest *);
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 9c8c93c6..8cc47e2a 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -792,6 +792,11 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         postCommandf_App("document.changed url:%s", cstr_String(d->url));
         return iFalse;
     }
+    else if (equal_Command(cmd, "gmrequest.timeout") &&
+             pointerLabel_Command(cmd, "request") == d->request) {
+        cancel_GmRequest(d->request);
+        return iFalse;
+    }
     else if (equal_Command(cmd, "document.request.cancelled") && document_Command(cmd) == d) {
         postCommand_App("navigate.back");
         return iFalse;