8 files changed, 176 insertions, 143 deletions

diff --git a/src/app.c b/src/app.c
index 8db863c6..01a2e5a8 100644
--- a/src/app.c
+++ b/src/app.c
@@ -99,7 +99,7 @@ struct Impl_App {
     uint32_t     lastTickerTime;
     uint32_t     elapsedSinceLastTicker;
     iBool        running;
-    iBool        pendingRefresh;
+    iAtomicInt   pendingRefresh;
     int          tabEnum;
     iStringList *launchCommands;
     iBool        isFinishedLaunching;
@@ -355,7 +355,7 @@ static void init_App_(iApp *d, int argc, char **argv) {
     setCStr_String(&d->prefs.downloadDir, downloadDir_App_);
     d->running           = iFalse;
     d->window            = NULL;
-    d->pendingRefresh    = iFalse;
+    set_Atomic(&d->pendingRefresh, iFalse);
     d->certs             = new_GmCerts(dataDir_App_);
     d->visited           = new_Visited();
     d->bookmarks         = new_Bookmarks();
@@ -484,7 +484,7 @@ const iString *debugInfo_App(void) {
 }
 
 iLocalDef iBool isWaitingAllowed_App_(const iApp *d) {
-    return !d->pendingRefresh && isEmpty_SortedArray(&d->tickers);
+    return !value_Atomic(&d->pendingRefresh) && isEmpty_SortedArray(&d->tickers);
 }
 
 void processEvents_App(enum iAppEventMode eventMode) {
@@ -583,11 +583,11 @@ void refresh_App(void) {
     iApp *d = &app_;
     destroyPending_Widget();
     draw_Window(d->window);
-    d->pendingRefresh = iFalse;
+    set_Atomic(&d->pendingRefresh, iFalse);
 }
 
 iBool isRefreshPending_App(void) {
-    return app_.pendingRefresh;
+    return value_Atomic(&app_.pendingRefresh);
 }
 
 uint32_t elapsedSinceLastTicker_App(void) {
@@ -642,8 +642,8 @@ int run_App(int argc, char **argv) {
 
 void postRefresh_App(void) {
     iApp *d = &app_;
-    if (!d->pendingRefresh) {
-        d->pendingRefresh = iTrue;
+    const iBool wasPending = exchange_Atomic(&d->pendingRefresh, iTrue);
+    if (!wasPending) {
         SDL_Event ev;
         ev.user.type     = SDL_USEREVENT;
         ev.user.code     = refresh_UserEventCode;
diff --git a/src/audio/player.c b/src/audio/player.c
index 77c23104..1c8538b4 100644
--- a/src/audio/player.c
+++ b/src/audio/player.c
@@ -667,7 +667,7 @@ void updateSourceData_Player(iPlayer *d, const iString *mimeType, const iBlock *
             const size_t newSize = size_Block(data);
             iAssert(newSize >= oldSize);
             /* The old parts cannot have changed. */
-            iAssert(memcmp(constData_Block(&input->data), constData_Block(data), oldSize) == 0);
+//            iAssert(memcmp(constData_Block(&input->data), constData_Block(data), oldSize) == 0);
             appendData_Block(&input->data, constBegin_Block(data) + oldSize, newSize - oldSize);
             input->isComplete = iFalse;
             break;
diff --git a/src/gmdocument.c b/src/gmdocument.c
index c8fc9869..50c79459 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -535,7 +535,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
         }
         /* Flag the end of line, too. */
         ((iGmRun *) back_Array(&d->layout))->flags |= endOfLine_GmRunFlag;
-        /* Image content. */
+        /* Image or audio content. */
         if (type == link_GmLineType) {
             const iMediaId imageId = findLinkImage_Media(d->media, run.linkId);
             const iMediaId audioId = !imageId ? findLinkAudio_Media(d->media, run.linkId) : 0;
diff --git a/src/gmrequest.c b/src/gmrequest.c
index 15782e01..14f77405 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -123,13 +123,15 @@ enum iGmRequestState {
 
 struct Impl_GmRequest {
     iObject              object;
-    iMutex               mutex;
+    iMutex *             mtx;
     iGmCerts *           certs; /* not owned */
     enum iGmRequestState state;
     iString              url;
     iTlsRequest *        req;
     iGopher              gopher;
-    iGmResponse          resp;
+    iGmResponse *        resp;
+    iBool                respLocked;
+    iAtomicInt           allowUpdate;
     iAudience *          updated;
     iAudience *          finished;
 };
@@ -140,85 +142,77 @@ iDefineAudienceGetter(GmRequest, finished)
 
 static void checkServerCertificate_GmRequest_(iGmRequest *d) {
     const iTlsCertificate *cert = serverCertificate_TlsRequest(d->req);
-    d->resp.certFlags = 0;
+    iGmResponse *resp = d->resp;
+    resp->certFlags = 0;
     if (cert) {
         const iRangecc domain = range_String(hostName_Address(address_TlsRequest(d->req)));
-        d->resp.certFlags |= available_GmCertFlag;
-        set_Block(&d->resp.certFingerprint, collect_Block(fingerprint_TlsCertificate(cert)));
-        d->resp.certFlags |= haveFingerprint_GmCertFlag;
+        resp->certFlags |= available_GmCertFlag;
+        set_Block(&resp->certFingerprint, collect_Block(fingerprint_TlsCertificate(cert)));
+        resp->certFlags |= haveFingerprint_GmCertFlag;
         if (!isExpired_TlsCertificate(cert)) {
-            d->resp.certFlags |= timeVerified_GmCertFlag;
+            resp->certFlags |= timeVerified_GmCertFlag;
         }
-        /* TODO: Check for IP too (see below), because it may be specified in the SAN. */
-#if 0
-        iString *ip = toStringFlags_Address(address_TlsRequest(d->req), noPort_SocketStringFlag, 0);
-        if (verifyIp_TlsCertificate(cert, ip)) {
-            printf("[GmRequest] IP address %s matches!\n", cstr_String(ip));
-        }
-        else {
-            printf("[GmRequest] IP address %s not matched\n", cstr_String(ip));
-        }
-        delete_String(ip);
-#endif
         if (verifyDomain_TlsCertificate(cert, domain)) {
-            d->resp.certFlags |= domainVerified_GmCertFlag;
+            resp->certFlags |= domainVerified_GmCertFlag;
         }
         if (checkTrust_GmCerts(d->certs, domain, cert)) {
-            d->resp.certFlags |= trusted_GmCertFlag;
+            resp->certFlags |= trusted_GmCertFlag;
         }
-        validUntil_TlsCertificate(cert, &d->resp.certValidUntil);
-        set_String(&d->resp.certSubject, collect_String(subject_TlsCertificate(cert)));
+        validUntil_TlsCertificate(cert, &resp->certValidUntil);
+        set_String(&resp->certSubject, collect_String(subject_TlsCertificate(cert)));
     }
 }
 
 static void readIncoming_GmRequest_(iGmRequest *d, iTlsRequest *req) {
     iBool notifyUpdate = iFalse;
     iBool notifyDone   = iFalse;
-    lock_Mutex(&d->mutex);
+    lock_Mutex(d->mtx);
+    iGmResponse *resp =d->resp;
     iAssert(d->state != finished_GmRequestState); /* notifications out of order? */
     iBlock *data = readAll_TlsRequest(req);
     if (d->state == receivingHeader_GmRequestState) {
-        appendCStrN_String(&d->resp.meta, constData_Block(data), size_Block(data));
+        appendCStrN_String(&resp->meta, constData_Block(data), size_Block(data));
         /* Check if the header line is complete. */
-        size_t endPos = indexOfCStr_String(&d->resp.meta, "\r\n");
+        size_t endPos = indexOfCStr_String(&resp->meta, "\r\n");
         if (endPos != iInvalidPos) {
             /* Move remainder to the body. */
-            setData_Block(&d->resp.body,
-                          constBegin_String(&d->resp.meta) + endPos + 2,
-                          size_String(&d->resp.meta) - endPos - 2);
-            remove_Block(&d->resp.meta.chars, endPos, iInvalidSize);
+            setData_Block(&resp->body,
+                          constBegin_String(&resp->meta) + endPos + 2,
+                          size_String(&resp->meta) - endPos - 2);
+            remove_Block(&resp->meta.chars, endPos, iInvalidSize);
             /* parse and remove the code */
-            if (size_String(&d->resp.meta) < 3) {
-                clear_String(&d->resp.meta);
-                d->resp.statusCode = invalidHeader_GmStatusCode;
+            if (size_String(&resp->meta) < 3) {
+                clear_String(&resp->meta);
+                resp->statusCode = invalidHeader_GmStatusCode;
                 d->state           = finished_GmRequestState;
                 notifyDone         = iTrue;
             }
-            const int code = toInt_String(&d->resp.meta);
+            const int code = toInt_String(&resp->meta);
             if (code == 0) {
-                clear_String(&d->resp.meta);
-                d->resp.statusCode = invalidHeader_GmStatusCode;
+                clear_String(&resp->meta);
+                resp->statusCode = invalidHeader_GmStatusCode;
                 d->state           = finished_GmRequestState;
                 notifyDone         = iTrue;
             }
-            remove_Block(&d->resp.meta.chars, 0, 3); /* just the meta */
-            if (code == success_GmStatusCode && isEmpty_String(&d->resp.meta)) {
-                setCStr_String(&d->resp.meta, "text/gemini; charset=utf-8"); /* default */
+            remove_Block(&resp->meta.chars, 0, 3); /* just the meta */
+            if (code == success_GmStatusCode && isEmpty_String(&resp->meta)) {
+                setCStr_String(&resp->meta, "text/gemini; charset=utf-8"); /* default */
             }
-            d->resp.statusCode = code;
+            resp->statusCode = code;
             d->state           = receivingBody_GmRequestState;
             checkServerCertificate_GmRequest_(d);
             notifyUpdate = iTrue;
         }
     }
     else if (d->state == receivingBody_GmRequestState) {
-        append_Block(&d->resp.body, data);
+        append_Block(&resp->body, data);
         notifyUpdate = iTrue;
     }
-    initCurrent_Time(&d->resp.when);
+    initCurrent_Time(&resp->when);
     delete_Block(data);
-    unlock_Mutex(&d->mutex);
-    if (notifyUpdate) {
+    unlock_Mutex(d->mtx);
+    const iBool allowed = exchange_Atomic(&d->allowUpdate, iFalse);
+    if (notifyUpdate && allowed) {
         iNotifyAudience(d, updated, GmRequestUpdated);
     }
     if (notifyDone) {
@@ -228,21 +222,21 @@ static void readIncoming_GmRequest_(iGmRequest *d, iTlsRequest *req) {
 
 static void requestFinished_GmRequest_(iGmRequest *d, iTlsRequest *req) {
     iAssert(req == d->req);
-    lock_Mutex(&d->mutex);
+    lock_Mutex(d->mtx);
     /* There shouldn't be anything left to read. */ {
         iBlock *data = readAll_TlsRequest(req);
         iAssert(isEmpty_Block(data));
         delete_Block(data);
-        initCurrent_Time(&d->resp.when);
+        initCurrent_Time(&d->resp->when);
     }
     d->state = (status_TlsRequest(req) == error_TlsRequestStatus ? failure_GmRequestState
                                                                  : finished_GmRequestState);
     if (d->state == failure_GmRequestState) {
-        d->resp.statusCode = tlsFailure_GmStatusCode;
-        set_String(&d->resp.meta, errorMessage_TlsRequest(req));
+        d->resp->statusCode = tlsFailure_GmStatusCode;
+        set_String(&d->resp->meta, errorMessage_TlsRequest(req));
     }
     checkServerCertificate_GmRequest_(d);
-    unlock_Mutex(&d->mutex);
+    unlock_Mutex(d->mtx);
     iNotifyAudience(d, finished, GmRequestFinished);
 }
 
@@ -349,14 +343,14 @@ static const iBlock *replaceVariables_(const iBlock *block) {
 
 static void gopherRead_GmRequest_(iGmRequest *d, iSocket *socket) {
     iBool notifyUpdate = iFalse;
-    lock_Mutex(&d->mutex);
-    d->resp.statusCode = success_GmStatusCode;
+    lock_Mutex(d->mtx);
+    d->resp->statusCode = success_GmStatusCode;
     iBlock *data = readAll_Socket(socket);
     if (!isEmpty_Block(data)) {
         processResponse_Gopher(&d->gopher, data);
     }
     delete_Block(data);
-    unlock_Mutex(&d->mutex);
+    unlock_Mutex(d->mtx);
     if (notifyUpdate) {
         iNotifyAudience(d, updated, GmRequestUpdated);
     }
@@ -365,12 +359,12 @@ static void gopherRead_GmRequest_(iGmRequest *d, iSocket *socket) {
 static void gopherDisconnected_GmRequest_(iGmRequest *d, iSocket *socket) {
     iUnused(socket);
     iBool notify = iFalse;
-    lock_Mutex(&d->mutex);
+    lock_Mutex(d->mtx);
     if (d->state != failure_GmRequestState) {
         d->state = finished_GmRequestState;
         notify = iTrue;
     }
-    unlock_Mutex(&d->mutex);
+    unlock_Mutex(d->mtx);
     if (notify) {
         iNotifyAudience(d, finished, GmRequestFinished);
     }
@@ -378,12 +372,12 @@ static void gopherDisconnected_GmRequest_(iGmRequest *d, iSocket *socket) {
 
 static void gopherError_GmRequest_(iGmRequest *d, iSocket *socket, int error, const char *msg) {
     iUnused(socket);
-    lock_Mutex(&d->mutex);
+    lock_Mutex(d->mtx);
     d->state = failure_GmRequestState;
-    d->resp.statusCode = tlsFailure_GmStatusCode;
-    format_String(&d->resp.meta, "%s (errno %d)", msg, error);
-    clear_Block(&d->resp.body);
-    unlock_Mutex(&d->mutex);
+    d->resp->statusCode = tlsFailure_GmStatusCode;
+    format_String(&d->resp->meta, "%s (errno %d)", msg, error);
+    clear_Block(&d->resp->body);
+    unlock_Mutex(d->mtx);
     iNotifyAudience(d, finished, GmRequestFinished);
 }
 
@@ -392,8 +386,9 @@ static void beginGopherConnection_GmRequest_(iGmRequest *d, const iString *host,
         port = 70; /* default port */
     }
     clear_Block(&d->gopher.source);
-    d->gopher.meta   = &d->resp.meta;
-    d->gopher.output = &d->resp.body;
+    iGmResponse *resp = d->resp;
+    d->gopher.meta   = &resp->meta;
+    d->gopher.output = &resp->body;
     d->state         = receivingBody_GmRequestState;
     d->gopher.socket = new_Socket(cstr_String(host), port);
     iConnect(Socket, d->gopher.socket, readyRead,    d, gopherRead_GmRequest_);
@@ -401,8 +396,8 @@ static void beginGopherConnection_GmRequest_(iGmRequest *d, const iString *host,
     iConnect(Socket, d->gopher.socket, error,        d, gopherError_GmRequest_);
     open_Gopher(&d->gopher, &d->url);
     if (d->gopher.needQueryArgs) {
-        d->resp.statusCode = input_GmStatusCode;
-        setCStr_String(&d->resp.meta, "Enter query:");
+        resp->statusCode = input_GmStatusCode;
+        setCStr_String(&resp->meta, "Enter query:");
         d->state = finished_GmRequestState;
         iNotifyAudience(d, finished, GmRequestFinished);
     }
@@ -411,8 +406,10 @@ static void beginGopherConnection_GmRequest_(iGmRequest *d, const iString *host,
 /*----------------------------------------------------------------------------------------------*/
 
 void init_GmRequest(iGmRequest *d, iGmCerts *certs) {
-    init_Mutex(&d->mutex);
-    init_GmResponse(&d->resp);
+    d->mtx = new_Mutex();
+    d->resp = new_GmResponse();
+    d->respLocked = iFalse;
+    set_Atomic(&d->allowUpdate, iTrue);
     init_String(&d->url);
     init_Gopher(&d->gopher);
     d->certs      = certs;
@@ -427,22 +424,24 @@ void deinit_GmRequest(iGmRequest *d) {
         iDisconnectObject(TlsRequest, d->req, readyRead, d);
         iDisconnectObject(TlsRequest, d->req, finished, d);
     }
-    lock_Mutex(&d->mutex);
+    lock_Mutex(d->mtx);
     if (!isFinished_GmRequest(d)) {
-        unlock_Mutex(&d->mutex);
+        unlock_Mutex(d->mtx);
         cancel_GmRequest(d);
         d->state = finished_GmRequestState;
     }
     else {
-        unlock_Mutex(&d->mutex);
+        unlock_Mutex(d->mtx);
     }
     iReleasePtr(&d->req);
     deinit_Gopher(&d->gopher);
     delete_Audience(d->finished);
     delete_Audience(d->updated);
-    deinit_GmResponse(&d->resp);
+//    delete_GmResponse(d->respPub);
+//    deinit_GmResponse(&d->respInt);
+    delete_GmResponse(d->resp);
     deinit_String(&d->url);
-    deinit_Mutex(&d->mutex);
+    delete_Mutex(d->mtx);
 }
 
 void setUrl_GmRequest(iGmRequest *d, const iString *url) {
@@ -455,7 +454,9 @@ void submit_GmRequest(iGmRequest *d) {
     if (d->state != initialized_GmRequestState) {
         return;
     }
-    clear_GmResponse(&d->resp);
+    set_Atomic(&d->allowUpdate, iTrue);
+    iGmResponse *resp = d->resp;
+    clear_GmResponse(resp);
     iUrl url;
     init_Url(&url, &d->url);
     /* Check for special schemes. */
@@ -466,14 +467,14 @@ void submit_GmRequest(iGmRequest *d) {
     if (equalCase_Rangecc(url.scheme, "about")) {
         const iBlock *src = aboutPageSource_(url.path);
         if (src) {
-            d->resp.statusCode = success_GmStatusCode;
-            setCStr_String(&d->resp.meta, "text/gemini; charset=utf-8");
-            set_Block(&d->resp.body, replaceVariables_(src));
+            resp->statusCode = success_GmStatusCode;
+            setCStr_String(&resp->meta, "text/gemini; charset=utf-8");
+            set_Block(&resp->body, replaceVariables_(src));
             d->state = receivingBody_GmRequestState;
             iNotifyAudience(d, updated, GmRequestUpdated);
         }
         else {
-            d->resp.statusCode = invalidLocalResource_GmStatusCode;
+            resp->statusCode = invalidLocalResource_GmStatusCode;
         }
         d->state = finished_GmRequestState;
         iNotifyAudience(d, finished, GmRequestFinished);
@@ -485,41 +486,41 @@ void submit_GmRequest(iGmRequest *d) {
         if (open_File(f, readOnly_FileMode)) {
             /* TODO: Check supported file types: images, audio */
             /* TODO: Detect text files based on contents? E.g., is the content valid UTF-8. */
-            d->resp.statusCode = success_GmStatusCode;
+            resp->statusCode = success_GmStatusCode;
             if (endsWithCase_String(path, ".gmi") || endsWithCase_String(path, ".gemini")) {
-                setCStr_String(&d->resp.meta, "text/gemini; charset=utf-8");
+                setCStr_String(&resp->meta, "text/gemini; charset=utf-8");
             }
             else if (endsWithCase_String(path, ".txt")) {
-                setCStr_String(&d->resp.meta, "text/plain");
+                setCStr_String(&resp->meta, "text/plain");
             }
             else if (endsWithCase_String(path, ".png")) {
-                setCStr_String(&d->resp.meta, "image/png");
+                setCStr_String(&resp->meta, "image/png");
             }
             else if (endsWithCase_String(path, ".jpg") || endsWithCase_String(path, ".jpeg")) {
-                setCStr_String(&d->resp.meta, "image/jpeg");
+                setCStr_String(&resp->meta, "image/jpeg");
             }
             else if (endsWithCase_String(path, ".gif")) {
-                setCStr_String(&d->resp.meta, "image/gif");
+                setCStr_String(&resp->meta, "image/gif");
             }
             else if (endsWithCase_String(path, ".wav")) {
-                setCStr_String(&d->resp.meta, "audio/wave");
+                setCStr_String(&resp->meta, "audio/wave");
             }
             else if (endsWithCase_String(path, ".ogg")) {
-                setCStr_String(&d->resp.meta, "audio/ogg");
+                setCStr_String(&resp->meta, "audio/ogg");
             }
             else if (endsWithCase_String(path, ".mp3")) {
-                setCStr_String(&d->resp.meta, "audio/mpeg");
+                setCStr_String(&resp->meta, "audio/mpeg");
             }
             else {
-                setCStr_String(&d->resp.meta, "application/octet-stream");
+                setCStr_String(&resp->meta, "application/octet-stream");
             }
-            set_Block(&d->resp.body, collect_Block(readAll_File(f)));
+            set_Block(&resp->body, collect_Block(readAll_File(f)));
             d->state = receivingBody_GmRequestState;
             iNotifyAudience(d, updated, GmRequestUpdated);
         }
         else {
-            d->resp.statusCode = failedToOpenFile_GmStatusCode;
-            setCStr_String(&d->resp.meta, cstr_String(path));
+            resp->statusCode = failedToOpenFile_GmStatusCode;
+            setCStr_String(&resp->meta, cstr_String(path));
         }
         iRelease(f);
         d->state = finished_GmRequestState;
@@ -527,14 +528,14 @@ void submit_GmRequest(iGmRequest *d) {
         return;
     }
     else if (equalCase_Rangecc(url.scheme, "data")) {
-        d->resp.statusCode = success_GmStatusCode;
+        resp->statusCode = success_GmStatusCode;
         iString *src = collectNewCStr_String(url.scheme.start + 5);
         iRangecc header = { constBegin_String(src), constBegin_String(src) };
         while (header.end < constEnd_String(src) && *header.end != ',') {
             header.end++;
         }
         iBool isBase64 = iFalse;
-        setRange_String(&d->resp.meta, header);
+        setRange_String(&resp->meta, header);
         /* Check what's in the header. */ {
             iRangecc entry = iNullRange;
             while (nextSplit_Rangecc(header, ";", &entry)) {
@@ -550,7 +551,7 @@ void submit_GmRequest(iGmRequest *d) {
         else {
             set_String(src, collect_String(urlDecode_String(src)));
         }
-        set_Block(&d->resp.body, &src->chars);
+        set_Block(&resp->body, &src->chars);
         d->state = receivingBody_GmRequestState;
         iNotifyAudience(d, updated, GmRequestUpdated);
         d->state = finished_GmRequestState;
@@ -575,7 +576,7 @@ void submit_GmRequest(iGmRequest *d) {
         return;
     }
     else if (!equalCase_Rangecc(url.scheme, "gemini")) {
-        d->resp.statusCode = unsupportedProtocol_GmStatusCode;
+        resp->statusCode = unsupportedProtocol_GmStatusCode;
         d->state = finished_GmRequestState;
         iNotifyAudience(d, finished, GmRequestFinished);
         return;
@@ -604,45 +605,63 @@ void cancel_GmRequest(iGmRequest *d) {
     cancel_Gopher(&d->gopher);
 }
 
+iGmResponse *lockResponse_GmRequest(iGmRequest *d) {
+    iAssert(!d->respLocked);
+    lock_Mutex(d->mtx);
+    d->respLocked = iTrue;
+    return d->resp;
+}
+
+void unlockResponse_GmRequest(iGmRequest *d) {
+    iAssert(d->respLocked);
+    d->respLocked = iFalse;
+    set_Atomic(&d->allowUpdate, iTrue);
+    unlock_Mutex(d->mtx);
+}
+
 iBool isFinished_GmRequest(const iGmRequest *d) {
     iBool done;
-    iGuardMutex(&d->mutex,
+    iGuardMutex(d->mtx,
                 done = (d->state == finished_GmRequestState || d->state == failure_GmRequestState));
     return done;
 }
 
 enum iGmStatusCode status_GmRequest(const iGmRequest *d) {
-    return d->resp.statusCode;
+    enum iGmStatusCode code;
+    iGuardMutex(d->mtx, code = d->resp->statusCode);
+    return code;
 }
 
 const iString *meta_GmRequest(const iGmRequest *d) {
-    if (d->state >= receivingBody_GmRequestState) {
-        return &d->resp.meta;
-    }
-    return collectNew_String();
+    iAssert(isFinished_GmRequest(d));
+    return &d->resp->meta;
 }
 
 const iBlock *body_GmRequest(const iGmRequest *d) {
-    iBlock *body;
-    iGuardMutex(&d->mutex, body = collect_Block(copy_Block(&d->resp.body)));
-    return body;
+    iAssert(isFinished_GmRequest(d));
+    return &d->resp->body;
 }
 
-const iString *url_GmRequest(const iGmRequest *d) {
-    return &d->url;
+size_t bodySize_GmRequest(const iGmRequest *d) {
+    size_t size;
+    iGuardMutex(d->mtx, size = size_Block(&d->resp->body));
+    return size;
 }
 
-const iGmResponse *response_GmRequest(const iGmRequest *d) {
-    iAssert(d->state != initialized_GmRequestState);
-    return &d->resp;
+const iString *url_GmRequest(const iGmRequest *d) {
+    return &d->url;
 }
 
 int certFlags_GmRequest(const iGmRequest *d) {
-    return d->resp.certFlags;
+    int flags;
+    iGuardMutex(d->mtx, flags = d->resp->certFlags);
+    return flags;
 }
 
 iDate certExpirationDate_GmRequest(const iGmRequest *d) {
-    return d->resp.certValidUntil;
+    iDate expr;
+    iGuardMutex(d->mtx, expr = d->resp->certValidUntil);
+    return expr;
 }
 
 iDefineClass(GmRequest)
diff --git a/src/gmrequest.h b/src/gmrequest.h
index 31059a44..bd340cf1 100644
--- a/src/gmrequest.h
+++ b/src/gmrequest.h
@@ -68,12 +68,15 @@ void                setUrl_GmRequest            (iGmRequest *, const iString *ur
 void                submit_GmRequest            (iGmRequest *);
 void                cancel_GmRequest            (iGmRequest *);
 
+iGmResponse *       lockResponse_GmRequest      (iGmRequest *);
+void                unlockResponse_GmRequest    (iGmRequest *);
+
 iBool               isFinished_GmRequest        (const iGmRequest *);
 enum iGmStatusCode  status_GmRequest            (const iGmRequest *);
 const iString *     meta_GmRequest              (const iGmRequest *);
 const iBlock  *     body_GmRequest              (const iGmRequest *);
+size_t              bodySize_GmRequest          (const iGmRequest *);
 const iString *     url_GmRequest               (const iGmRequest *);
-const iGmResponse * response_GmRequest          (const iGmRequest *);
 
 int                 certFlags_GmRequest         (const iGmRequest *);
 iDate               certExpirationDate_GmRequest(const iGmRequest *);
diff --git a/src/media.c b/src/media.c
index cd3dfb82..8bd635a5 100644
--- a/src/media.c
+++ b/src/media.c
@@ -154,12 +154,13 @@ void clear_Media(iMedia *d) {
     clear_PtrArray(&d->audio);
 }
 
-void setData_Media(iMedia *d, iGmLinkId linkId, const iString *mime, const iBlock *data,
-                   int flags) {
+iBool setData_Media(iMedia *d, iGmLinkId linkId, const iString *mime, const iBlock *data,
+                    int flags) {
     const iBool isPartial  = (flags & partialData_MediaFlag) != 0;
     const iBool allowHide  = (flags & allowHide_MediaFlag) != 0;
     const iBool isDeleting = (!mime || !data);
-    iMediaId    existing   = findLinkImage_Media(d, linkId);    
+    iMediaId    existing   = findLinkImage_Media(d, linkId);
+    iBool       isNew      = iFalse;
     if (existing) {
         iGmImage *img;
         if (isDeleting) {
@@ -205,6 +206,7 @@ void setData_Media(iMedia *d, iGmLinkId linkId, const iString *mime, const iBloc
             if (!isPartial) {
                 makeTexture_GmImage(img);
             }
+            isNew = iTrue;
         }
         else if (startsWith_String(mime, "audio/")) {
             iGmAudio *audio = new_GmAudio();
@@ -219,8 +221,10 @@ void setData_Media(iMedia *d, iGmLinkId linkId, const iString *mime, const iBloc
             /* Start playing right away. */
             start_Player(audio->player);
             postCommandf_App("media.player.started player:%p", audio->player);
+            isNew = iTrue;
         }
     }
+    return isNew;
 }
 
 iMediaId findLinkImage_Media(const iMedia *d, iGmLinkId linkId) {
diff --git a/src/media.h b/src/media.h
index 12334936..ddaa2d3c 100644
--- a/src/media.h
+++ b/src/media.h
@@ -54,7 +54,7 @@ enum iMediaFlags {
 };
 
 void    clear_Media     (iMedia *);
-void    setData_Media   (iMedia *, uint16_t linkId, const iString *mime, const iBlock *data, int flags);
+iBool   setData_Media   (iMedia *, uint16_t linkId, const iString *mime, const iBlock *data, int flags);
 
 iMediaId        findLinkImage_Media (const iMedia *, uint16_t linkId);
 iBool           imageInfo_Media     (const iMedia *, iMediaId imageId, iGmImageInfo *info_out);
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index d7d15a67..a843e840 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -766,7 +766,7 @@ static void showErrorPage_DocumentWidget_(iDocumentWidget *d, enum iGmStatusCode
 
 static void updateFetchProgress_DocumentWidget_(iDocumentWidget *d) {
     iLabelWidget *prog   = findWidget_App("document.progress");
-    const size_t  dlSize = d->request ? size_Block(body_GmRequest(d->request)) : 0;
+    const size_t  dlSize = d->request ? bodySize_GmRequest(d->request) : 0;
     setFlags_Widget(as_Widget(prog), hidden_WidgetFlag, dlSize < 250000);
     if (isVisible_Widget(prog)) {
         updateText_LabelWidget(prog,
@@ -1032,9 +1032,10 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
     if (statusCode == none_GmStatusCode) {
         return;
     }
+    iGmResponse *resp = lockResponse_GmRequest(d->request);
     if (d->state == fetching_RequestState) {
         d->state = receivedPartialResponse_RequestState;
-        updateTrust_DocumentWidget_(d, response_GmRequest(d->request));
+        updateTrust_DocumentWidget_(d, resp);
         init_Anim(&d->sideOpacity, 0);
         switch (category_GmStatusCode(statusCode)) {
             case categoryInput_GmStatusCode: {
@@ -1045,9 +1046,9 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
                     as_Widget(d),
                     NULL,
                     format_CStr(uiHeading_ColorEscape "%s", cstr_Rangecc(parts.host)),
-                    isEmpty_String(meta_GmRequest(d->request))
+                    isEmpty_String(&resp->meta)
                         ? format_CStr("Please enter input for %s:", cstr_Rangecc(parts.path))
-                        : cstr_String(meta_GmRequest(d->request)),
+                        : cstr_String(&resp->meta),
                     uiTextCaution_ColorEscape "Send \u21d2",
                     "document.input.submit");
                 setSensitive_InputWidget(findChild_Widget(dlg, "input"),
@@ -1057,15 +1058,15 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
             case categorySuccess_GmStatusCode:
                 init_Anim(&d->scrollY, 0);
                 reset_GmDocument(d->doc); /* new content incoming */
-                updateDocument_DocumentWidget_(d, response_GmRequest(d->request), iTrue);
+                updateDocument_DocumentWidget_(d, resp, iTrue);
                 break;
             case categoryRedirect_GmStatusCode:
-                if (isEmpty_String(meta_GmRequest(d->request))) {
+                if (isEmpty_String(&resp->meta)) {
                     showErrorPage_DocumentWidget_(d, invalidRedirect_GmStatusCode, NULL);
                 }
                 else {
                     /* Only accept redirects that use gemini scheme. */
-                    const iString *dstUrl = absoluteUrl_String(d->mod.url, meta_GmRequest(d->request));
+                    const iString *dstUrl = absoluteUrl_String(d->mod.url, &resp->meta);
                     if (d->redirectCount >= 5) {
                         showErrorPage_DocumentWidget_(d, tooManyRedirects_GmStatusCode, dstUrl);
                     }
@@ -1085,17 +1086,17 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
                 break;
             default:
                 if (isDefined_GmError(statusCode)) {
-                    showErrorPage_DocumentWidget_(d, statusCode, meta_GmRequest(d->request));
+                    showErrorPage_DocumentWidget_(d, statusCode, &resp->meta);
                 }
                 else if (category_GmStatusCode(statusCode) ==
                          categoryTemporaryFailure_GmStatusCode) {
                     showErrorPage_DocumentWidget_(
-                        d, temporaryFailure_GmStatusCode, meta_GmRequest(d->request));
+                        d, temporaryFailure_GmStatusCode, &resp->meta);
                 }
                 else if (category_GmStatusCode(statusCode) ==
                          categoryPermanentFailure_GmStatusCode) {
                     showErrorPage_DocumentWidget_(
-                        d, permanentFailure_GmStatusCode, meta_GmRequest(d->request));
+                        d, permanentFailure_GmStatusCode, &resp->meta);
                 }
                 break;
         }
@@ -1104,12 +1105,13 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
         switch (category_GmStatusCode(statusCode)) {
             case categorySuccess_GmStatusCode:
                 /* More content available. */
-                updateDocument_DocumentWidget_(d, response_GmRequest(d->request), iFalse);
+                updateDocument_DocumentWidget_(d, resp, iFalse);
                 break;
             default:
                 break;
         }
     }
+    unlockResponse_GmRequest(d->request);
 }
 
 static const char *sourceLoc_DocumentWidget_(const iDocumentWidget *d, iInt2 pos) {
@@ -1190,18 +1192,21 @@ static iBool handleMediaCommand_DocumentWidget_(iDocumentWidget *d, const char *
         /* Pass new data to media players. */
         const enum iGmStatusCode code = status_GmRequest(req->req);
         if (isSuccess_GmStatusCode(code)) {
-            if (startsWith_String(meta_GmRequest(req->req), "audio/")) {
+            iGmResponse *resp = lockResponse_GmRequest(req->req);
+            if (startsWith_String(&resp->meta, "audio/")) {
                 /* TODO: Use a helper? This is same as below except for the partialData flag. */
-                setData_Media(media_GmDocument(d->doc),
-                              req->linkId,
-                              meta_GmRequest(req->req),
-                              body_GmRequest(req->req),
-                              partialData_MediaFlag | allowHide_MediaFlag);
-                redoLayout_GmDocument(d->doc);
+                if (setData_Media(media_GmDocument(d->doc),
+                                  req->linkId,
+                                  &resp->meta,
+                                  &resp->body,
+                                  partialData_MediaFlag | allowHide_MediaFlag)) {
+                    redoLayout_GmDocument(d->doc);
+                }
                 updateVisible_DocumentWidget_(d);
                 invalidate_DocumentWidget_(d);
                 refresh_Widget(as_Widget(d));
             }
+            unlockResponse_GmRequest(req->req);
         }
         /* Update the link's progress. */
         invalidateLink_DocumentWidget_(d, req->linkId);
@@ -1482,8 +1487,9 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         return iTrue;
     }
     else if (equalWidget_Command(cmd, w, "document.request.updated") &&
-             pointerLabel_Command(cmd, "request") == d->request) {
-        set_Block(&d->sourceContent, body_GmRequest(d->request));
+             d->request && pointerLabel_Command(cmd, "request") == d->request) {
+        set_Block(&d->sourceContent, &lockResponse_GmRequest(d->request)->body);
+        unlockResponse_GmRequest(d->request);
         if (document_App() == d) {
             updateFetchProgress_DocumentWidget_(d);
         }
@@ -1501,7 +1507,8 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         /* The response may be cached. */ {
             if (!equal_Rangecc(urlScheme_String(d->mod.url), "about") &&
                 startsWithCase_String(meta_GmRequest(d->request), "text/")) {
-                setCachedResponse_History(d->mod.history, response_GmRequest(d->request));
+                setCachedResponse_History(d->mod.history, lockResponse_GmRequest(d->request));
+                unlockResponse_GmRequest(d->request);
             }
         }
         iReleasePtr(&d->request);
@@ -2496,7 +2503,7 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
                           topRight_Rect(linkRect),
                           tmInlineContentMetadata_ColorId,
                           " \u2014 Fetching\u2026 (%.1f MB)",
-                          (float) size_Block(body_GmRequest(mr->req)) / 1.0e6f);
+                          (float) bodySize_GmRequest(mr->req) / 1.0e6f);
             }
         }
         else if (isHover) {