Commit 93a6fa5b authored by Ruediger Pluem's avatar Ruediger Pluem
Browse files

* As per discussion on the list: Return error code of apr_file_write_full 

  or apr_bucket_read instead of APR_EGENERAL if they fail.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@390499 13f79535-47bb-0310-9956-ffa450edef68
parent 4ad433b2

modules/cache/mod_disk_cache.c

+2 −2
Changes for modules/cache/mod_disk_cache.c: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -991,7 +991,7 @@ static apr_status_t store_body(cache_handle_t *h, request_rec *r, 
                         h->cache_obj->key);

            /* Remove the intermediate cache file and return non-APR_SUCCESS */

            file_cache_errorcleanup(dobj, r);

            return APR_EGENERAL;

            return rv;

        }

        rv = apr_file_write_full(dobj->tfd, str, length, &written);

        if (rv != APR_SUCCESS) {
@@ -1000,7 +1000,7 @@ static apr_status_t store_body(cache_handle_t *h, request_rec *r, 
                         h->cache_obj->key);

            /* Remove the intermediate cache file and return non-APR_SUCCESS */

            file_cache_errorcleanup(dobj, r);

            return APR_EGENERAL;

            return rv;

        }

        dobj->file_size += written;

        if (dobj->file_size > conf->maxfs) {