Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/97870122dd93a4603a23088f78c7d9eb266806b8
...commit
http://git.netsurf-browser.org/netsurf.git/commit/97870122dd93a4603a23088f78c7d9eb266806b8
...tree
http://git.netsurf-browser.org/netsurf.git/tree/97870122dd93a4603a23088f78c7d9eb266806b8
The branch, master has been updated
via 97870122dd93a4603a23088f78c7d9eb266806b8 (commit)
from 5cfe0dfffcf423c411004ac565959c686bfb24c9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=97870122dd93a4603a23088f78c7d9eb266806b8
commit 97870122dd93a4603a23088f78c7d9eb266806b8
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
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 <[email protected]>
diff --git a/content/fetch.c b/content/fetch.c
index 94654fc..331b5f4 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 817d5e2..fdb3bfb 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 {
-----------------------------------------------------------------------
Summary of changes:
content/fetch.c | 1 +
content/fetch.h | 6 ++++++
2 files changed, 7 insertions(+)
diff --git a/content/fetch.c b/content/fetch.c
index 94654fc..331b5f4 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 817d5e2..fdb3bfb 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 {
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
