diff options
| author | Daniel Silverstone <dsilvers@digital-scurf.org> | 2019-08-05 20:56:07 +0100 |
|---|---|---|
| committer | Daniel Silverstone <dsilvers@digital-scurf.org> | 2019-08-05 20:56:07 +0100 |
| commit | 170dc5d52419450edc440c054a94135c1cc1296a (patch) | |
| tree | 0943167d6fa71716bd1cd8936b94cfd02fe10e5c /content/content.c | |
| parent | bfb1bb119241d85bb9b400881328496e12a39aed (diff) | |
| download | netsurf-170dc5d52419450edc440c054a94135c1cc1296a.tar.gz netsurf-170dc5d52419450edc440c054a94135c1cc1296a.tar.bz2 | |
Excise the llcache query pathway.
In further preparation for the auth and cert queries being handled
as special contents from `about:` this excises the query pathway
from the llcache pretty much entirely.
Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>
Diffstat (limited to 'content/content.c')
| -rw-r--r-- | content/content.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/content/content.c b/content/content.c index dc9805448..385847daf 100644 --- a/content/content.c +++ b/content/content.c @@ -176,12 +176,12 @@ nserror content_llcache_callback(llcache_handle *llcache, case LLCACHE_EVENT_ERROR: /** \todo Error page? */ c->status = CONTENT_STATUS_ERROR; - msg_data.errordata.errorcode = NSERROR_UNKNOWN; - msg_data.errordata.errormsg = event->data.msg; + msg_data.errordata.errorcode = event->data.error.code; + msg_data.errordata.errormsg = event->data.error.msg; content_broadcast(c, CONTENT_MSG_ERROR, &msg_data); break; case LLCACHE_EVENT_PROGRESS: - content_set_status(c, event->data.msg); + content_set_status(c, event->data.progress_msg); msg_data.explicit_status_text = NULL; content_broadcast(c, CONTENT_MSG_STATUS, &msg_data); break; @@ -190,13 +190,6 @@ nserror content_llcache_callback(llcache_handle *llcache, msg_data.redirect.to = event->data.redirect.to; content_broadcast(c, CONTENT_MSG_REDIRECT, &msg_data); break; - case LLCACHE_EVENT_QUERY: - case LLCACHE_EVENT_QUERY_FINISHED: - /* Should never happen, because the object can't query once - * it has fetched enough that a migration to content happened. - */ - NSLOG(netsurf, DEBUG, "Encountered query related events during content handling"); - break; } return error; |