Commit 42b75cfc authored by Graham Leggett's avatar Graham Leggett
Browse files

mod_disk_cache: NULL fd pointers when closing them, fix missing 

close/flush, remove some unneccessary code duplication instead
of calling the right helper in replace_brigade_with_cache().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@462601 13f79535-47bb-0310-9956-ffa450edef68
parent 1fac44bc

CHANGES

+5 −0
Changes for CHANGES: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,11 @@ 
Changes with Apache 2.3.0

  [Remove entries to the current 2.0 and 2.2 section below, when backported]









  *) mod_disk_cache: NULL fd pointers when closing them, fix missing









     close/flush, remove some unneccessary code duplication instead









     of calling the right helper in replace_brigade_with_cache().









     [Niklas Edmundsson <nikke acc.umu.se>]

















  *) sendfile_nonblocking() takes the _brigade_ as an argument, gets 









     the first bucket from the brigade, finds it not to be a FILE









     bucket and barfs. The fix is to pass a bucket rather than a brigade.


































modules/cache/mod_disk_cache.c



+24
−13



























Changes for modules/cache/mod_disk_cache.c: 24 added lines, 13 removed lines.



Original line number
Diff line number
Diff line







@@ -445,6 +445,7 @@ static apr_status_t open_header_timeout(cache_handle_t *h, request_rec *r,







    while(1) {









        if(dobj->hfd) {









            apr_file_close(dobj->hfd);









            dobj->hfd = NULL;









        }









        rc = open_header(h, r, key, conf);









        if(rc != APR_SUCCESS && rc != CACHE_ENODATA) {










@@ -978,6 +979,7 @@ static apr_status_t recall_headers(cache_handle_t *h, request_rec *r)







    }



















    apr_file_close(dobj->hfd);









    dobj->hfd = NULL;



















    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,









                 "disk_cache: Recalled headers for URL %s",  dobj->name);










@@ -1308,6 +1310,7 @@ static apr_status_t store_headers(cache_handle_t *h, request_rec *r,







            rv = apr_file_open(&dobj->hfd, dobj->hdrsfile, 









                    APR_WRITE | APR_BINARY | APR_BUFFERED, 0, r->pool);









            if (rv != APR_SUCCESS) {









                dobj->hfd = NULL;









                return rv;









            }









        }










@@ -1342,6 +1345,19 @@ static apr_status_t store_headers(cache_handle_t *h, request_rec *r,







        return rv;









    }



















    /* If the body size is unknown, the header file will be rewritten later









       so we can't close it */









    if(dobj->initial_size < 0) {









        rv = apr_file_flush(dobj->hfd);









    }









    else {









        rv = apr_file_close(dobj->hfd);









        dobj->hfd = NULL;









    }









    if(rv != APR_SUCCESS) {









        return rv;









    }



















    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,









                 "disk_cache: Stored headers for URL %s",  dobj->name);









    return APR_SUCCESS;










@@ -1418,23 +1434,20 @@ static apr_status_t replace_brigade_with_cache(cache_handle_t *h,







                                               apr_bucket_brigade *bb)









{









    apr_status_t rv;









    int flags;









    apr_bucket *e;









    core_dir_config *pdcfg = ap_get_module_config(r->per_dir_config,









            &core_module);









    disk_cache_object_t *dobj = (disk_cache_object_t *) h->cache_obj->vobj;



















    flags = APR_READ|APR_BINARY;









#if APR_HAS_SENDFILE









    flags |= ((pdcfg->enable_sendfile == ENABLE_SENDFILE_OFF)









            ? 0 : APR_SENDFILE_ENABLED);









#endif



















    rv = apr_file_open(&dobj->fd, dobj->datafile, flags, 0, r->pool);









    if(dobj->fd) {









        apr_file_close(dobj->fd);









        dobj->fd = NULL;









    }









    rv = open_body_timeout(r, dobj->name, dobj);









    if (rv != APR_SUCCESS) {









        if(rv != CACHE_EDECLINED) {









            ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,









                         "disk_cache: Error opening datafile %s for URL %s",









                         dobj->datafile, dobj->name);









        }









        return rv;









    }




















@@ -1664,14 +1677,12 @@ static apr_status_t store_body(cache_handle_t *h, request_rec *r,

















    /* All checks were fine, close output file */









    rv = apr_file_close(dobj->fd);









    dobj->fd = NULL;









    if(rv != APR_SUCCESS) {









        file_cache_errorcleanup(dobj, r);









        return rv;









    }



















    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,









                 "disk_cache: Body for URL %s cached.",  dobj->name);



















    /* Redirect to cachefile if we copied a plain file */









    if(copy_file) {









        rv = replace_brigade_with_cache(h, r, bb);