www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Code Activity

mod_cache_disk: Only attempt to commit to the initialisation if the attempt

Browse Source 
to open the cache file was successful.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1078083 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Graham Leggett
2011-03-04 18:11:32 +00:00
parent 81386f1120
commit d35c89b1e0
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/cache/mod_cache_disk.c vendored
View File

@@ -432,8 +432,8 @@ static int open_entity(cache_handle_t *h, request_rec *r, const char *key)
}
/* Create and init the cache object */
h->cache_obj = obj = apr_pcalloc(r->pool, sizeof(cache_object_t));
obj->vobj = dobj = apr_pcalloc(r->pool, sizeof(disk_cache_object_t));
obj = apr_pcalloc(r->pool, sizeof(cache_object_t));
dobj = apr_pcalloc(r->pool, sizeof(disk_cache_object_t));
info = &(obj->info);
@@ -570,11 +570,20 @@ static int open_entity(cache_handle_t *h, request_rec *r, const char *key)
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
"cache_disk: Recalled cached URL info header %s", dobj->name);
/* make the configuration stick */
h->cache_obj = obj;
obj->vobj = dobj;
return OK;
}
}
else {
/* make the configuration stick */
h->cache_obj = obj;
obj->vobj = dobj;
return OK;
}