From: Ruediger Pluem <rpluem@apache.org>
Date: Fri, 31 Mar 2006 21:09:58 +0000 (+0000)
Subject: * As per discussion on the list: Return error code of apr_file_write_full
X-Git-Tag: 2.3.0~2482
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8280850d65b3a4d4c3bf952ed5336e113262f18f;p=thirdparty%2Fapache%2Fhttpd.git

* 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
---

diff --git a/modules/cache/mod_disk_cache.c b/modules/cache/mod_disk_cache.c
index b1b8f9801d8..bf342792716 100644
--- a/modules/cache/mod_disk_cache.c
+++ b/modules/cache/mod_disk_cache.c
@@ -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) {