eukara
/
WebSurf
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reset fetch state when refetching object. 

Ensure that cache control data is invalidated for 401/certificate failure so that conditional headers are not emitted when object is refetched.

svn path=/trunk/netsurf/; revision=10408
This commit is contained in:
John Mark Bell 2010-04-16 20:08:27 +00:00
parent b008327de1
commit ca0daa1a66
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
content/llcache.c
View File

@ -937,6 +937,9 @@ nserror llcache_object_refetch(llcache_object *object)
object->cache.etag = NULL;
object->cache.last_modified = 0;
/* Reset fetch state */
object->fetch.state = LLCACHE_FETCH_INIT;
#ifdef LLCACHE_TRACE
LOG(("Refetching %p", object));
#endif
@ -2077,6 +2080,9 @@ nserror llcache_fetch_auth(llcache_object *object, const char *realm)
fetch_abort(object->fetch.fetch);
object->fetch.fetch = NULL;
/* Invalidate cache-control data */
memset(&object->cache, 0, sizeof(llcache_cache_control));
/* Destroy headers */
while (object->num_headers > 0) {
object->num_headers--;
@ -2111,10 +2117,7 @@ nserror llcache_fetch_auth(llcache_object *object, const char *realm)
} else {
llcache_event event;
/* Invalidate cache-control data */
memset(&object->cache, 0,
sizeof(llcache_cache_control));
/* Mark it complete */
/* Mark object complete */
object->fetch.state = LLCACHE_FETCH_COMPLETE;
/* Inform client(s) that object fetch failed */
@ -2151,6 +2154,9 @@ nserror llcache_fetch_cert_error(llcache_object *object,
fetch_abort(object->fetch.fetch);
object->fetch.fetch = NULL;
/* Invalidate cache-control data */
memset(&object->cache, 0, sizeof(llcache_cache_control));
if (query_cb != NULL) {
llcache_query query;
@ -2165,9 +2171,7 @@ nserror llcache_fetch_cert_error(llcache_object *object,
} else {
llcache_event event;
/* Invalidate cache-control data */
memset(&object->cache, 0, sizeof(llcache_cache_control));
/* Mark it complete */
/* Mark object complete */
object->fetch.state = LLCACHE_FETCH_COMPLETE;
/* Inform client(s) that object fetch failed */