diff options
Diffstat (limited to 'content/fetchers/resource.c')
| -rw-r--r-- | content/fetchers/resource.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/content/fetchers/resource.c b/content/fetchers/resource.c index 9b3f28ce5..286f99e12 100644 --- a/content/fetchers/resource.c +++ b/content/fetchers/resource.c @@ -434,6 +434,7 @@ static void fetch_resource_abort(void *ctx) static void fetch_resource_poll(lwc_string *scheme) { struct fetch_resource_context *c, *next; + bool was_last_item = false; if (ring == NULL) return; @@ -461,14 +462,28 @@ static void fetch_resource_poll(lwc_string *scheme) * as processing this item may have added to the ring */ next = c->r_next; + was_last_item = next == c; fetch_remove_from_queues(c->fetchh); fetch_free(c->fetchh); + /* Having called into the fetch machinery, our ring might + * have been updated + */ + if (was_last_item) { + /* We were previously the last item in the ring + * so let's reset to the head of the ring + * and try again + */ + c = ring; + } else { + c = next; + } + /* Advance to next ring entry, exiting if we've reached * the start of the ring or the ring has become empty */ - } while ( (c = next) != ring && ring != NULL); + } while (ring != NULL); } nserror fetch_resource_register(void) |