mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-01-03 09:44:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ensure we invalidate cache data and mark objects as complete on failure to fetch.

Browse Source 
svn path=/trunk/netsurf/; revision=10402
This commit is contained in:
John Mark Bell 2010-04-14 20:42:03 +00:00
parent 0235cc68d8
commit 1c42c0569f
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
content/llcache.c
View File

@ -1516,6 +1516,11 @@ nserror llcache_query_handle_response(bool proceed, void *cbpw)
if (proceed) if (proceed)
return llcache_object_refetch(object); return llcache_object_refetch(object);
/* Invalidate cache-control data */
memset(&object->cache, 0, sizeof(llcache_cache_control));
/* Mark it complete */
object->fetch.state = LLCACHE_FETCH_COMPLETE;
/* Inform client(s) that object fetch failed */ /* Inform client(s) that object fetch failed */
event.type = LLCACHE_EVENT_ERROR; event.type = LLCACHE_EVENT_ERROR;
/** \todo More appropriate error message */ /** \todo More appropriate error message */
@ -1601,6 +1606,7 @@ void llcache_fetch_callback(fetch_msg msg, void *p, const void *data,
case FETCH_ERROR: case FETCH_ERROR:
/* An error occurred while fetching */ /* An error occurred while fetching */
/* The fetch has has already been cleaned up by the fetcher */ /* The fetch has has already been cleaned up by the fetcher */
object->fetch.state = LLCACHE_FETCH_COMPLETE;
object->fetch.fetch = NULL; object->fetch.fetch = NULL;
/* Invalidate cache control data */ /* Invalidate cache control data */
@ -1639,6 +1645,11 @@ void llcache_fetch_callback(fetch_msg msg, void *p, const void *data,
if (object->fetch.fetch != NULL) { if (object->fetch.fetch != NULL) {
fetch_abort(object->fetch.fetch); fetch_abort(object->fetch.fetch);
object->fetch.fetch = NULL; object->fetch.fetch = NULL;
/* Invalidate cache control data */
memset(&(object->cache), 0,
sizeof(llcache_cache_control));
object->fetch.state = LLCACHE_FETCH_COMPLETE;
} }
return; return;
} }
@ -1790,13 +1801,15 @@ nserror llcache_fetch_notmodified(llcache_object *object,
/* Bring candidate's cache data up to date */ /* Bring candidate's cache data up to date */
llcache_object_cache_update(object->candidate); llcache_object_cache_update(object->candidate);
/* Invalidate our cache-control data */
memset(&object->cache, 0, sizeof(llcache_cache_control));
/* Ensure fetch has stopped */ /* Ensure fetch has stopped */
fetch_abort(object->fetch.fetch); fetch_abort(object->fetch.fetch);
object->fetch.fetch = NULL; object->fetch.fetch = NULL;
/* Invalidate our cache-control data */
memset(&object->cache, 0, sizeof(llcache_cache_control));
/* Mark it complete */
object->fetch.state = LLCACHE_FETCH_COMPLETE;
/* Candidate is now our object */ /* Candidate is now our object */
*replacement = object->candidate; *replacement = object->candidate;
@ -2083,6 +2096,11 @@ nserror llcache_fetch_auth(llcache_object *object, const char *realm)
} else { } else {
llcache_event event; llcache_event event;
/* Invalidate cache-control data */
memset(&object->cache, 0, sizeof(llcache_cache_control));
/* Mark it complete */
object->fetch.state = LLCACHE_FETCH_COMPLETE;
/* Inform client(s) that object fetch failed */ /* Inform client(s) that object fetch failed */
event.type = LLCACHE_EVENT_ERROR; event.type = LLCACHE_EVENT_ERROR;
/** \todo More appropriate error message */ /** \todo More appropriate error message */
@ -2125,6 +2143,11 @@ nserror llcache_fetch_cert_error(llcache_object *object,
} else { } else {
llcache_event event; llcache_event event;
/* Invalidate cache-control data */
memset(&object->cache, 0, sizeof(llcache_cache_control));
/* Mark it complete */
object->fetch.state = LLCACHE_FETCH_COMPLETE;
/* Inform client(s) that object fetch failed */ /* Inform client(s) that object fetch failed */
event.type = LLCACHE_EVENT_ERROR; event.type = LLCACHE_EVENT_ERROR;
/** \todo More appropriate error message */ /** \todo More appropriate error message */