diff options
author | Daniel Silverstone <dsilvers@digital-scurf.org> | 2020-02-24 10:24:23 +0000 |
---|---|---|
committer | Daniel Silverstone <dsilvers@digital-scurf.org> | 2020-02-24 10:24:23 +0000 |
commit | 97870122dd93a4603a23088f78c7d9eb266806b8 (patch) | |
tree | 3d2a99c9c0e03a9f5ffb22b1c4dbec68bb2f19ef | |
parent | 5cfe0dfffcf423c411004ac565959c686bfb24c9 (diff) | |
download | netsurf-97870122dd93a4603a23088f78c7d9eb266806b8.tar.gz netsurf-97870122dd93a4603a23088f78c7d9eb266806b8.tar.bz2 |
fetch: When aborting, ensure we note this to not multi-fail
When aborting a fetch, it may be cleaned up, in which case we
would otherwise send a spurious failure message too early. Instead
we record that the abort has occurred to suppress such an error.
Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>
-rw-r--r-- | content/fetch.c | 1 | ||||
-rw-r--r-- | content/fetch.h | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/content/fetch.c b/content/fetch.c index 94654fc6b..331b5f430 100644 --- a/content/fetch.c +++ b/content/fetch.c @@ -585,6 +585,7 @@ fetch_start(nsurl *url, void fetch_abort(struct fetch *f) { assert(f); + f->last_msg = FETCH__INTERNAL_ABORTED; NSLOG(fetch, DEBUG, "fetch %p, fetcher %p, url '%s'", f, f->fetcher_handle, nsurl_access(f->url)); diff --git a/content/fetch.h b/content/fetch.h index 817d5e2f8..fdb3bfbd8 100644 --- a/content/fetch.h +++ b/content/fetch.h @@ -61,6 +61,12 @@ typedef enum { #define FETCH_MIN_FINISHED_MSG FETCH_FINISHED /** + * This message is actually an internal message used to indicate + * that a fetch was aborted. Do not send this, nor expect it. + */ +#define FETCH__INTERNAL_ABORTED FETCH_ERROR + +/** * Fetcher message data */ typedef struct fetch_msg { |