Cancel the expected URL after offering a download, part 2 (BUG#982)

There was a convoluted way of using an already freed bw:

 first, one bw asks for a page, and that becomes conn->bw,
 and then another bw starts also asking for the page, and
 the first bw closes, invalidating the conn->bw, and then
 the second bw closes and the cancel expect code tries to
 use the old bw.

Fixed now.

2 files changed, 2 insertions, 1 deletions

diff --git a/src/cache.c b/src/cache.c
index 5ea45511..3804ac7e 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -1176,6 +1176,8 @@ static CacheEntry_t *Cache_process_queue(CacheEntry_t *entry)
                }
             }
             if (AbortEntry) {
+               if (ClientWeb->flags & WEB_RootUrl)
+                  a_Nav_cancel_expect_if_eq(Client_bw, Client->Url);
                a_Bw_remove_client(Client_bw, Client->Key);
                Cache_client_dequeue(Client, NULLKey);
                --i; /* Keep the index value in the next iteration */
diff --git a/src/capi.c b/src/capi.c
index 885b4eb8..33cfb54c 100644
--- a/src/capi.c
+++ b/src/capi.c
@@ -767,7 +767,6 @@ void a_Capi_ccc(int Op, int Branch, int Dir, ChainLink *Info,
             a_Chain_bcb(OpAbort, Info, NULL, NULL);
             /* remove the cache entry for this URL */
             a_Cache_entry_remove_by_url(conn->url);
-            a_Nav_cancel_expect_if_eq(conn->bw, conn->url);
             Capi_conn_unref(conn);
             dFree(Info);
             break;