httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rpl...@apache.org
Subject svn commit: r390499 - /httpd/httpd/trunk/modules/cache/mod_disk_cache.c
Date Fri, 31 Mar 2006 21:10:01 GMT
Author: rpluem
Date: Fri Mar 31 13:09:58 2006
New Revision: 390499

URL: http://svn.apache.org/viewcvs?rev=390499&view=rev
Log:
* 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.

Modified:
    httpd/httpd/trunk/modules/cache/mod_disk_cache.c

Modified: httpd/httpd/trunk/modules/cache/mod_disk_cache.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/mod_disk_cache.c?rev=390499&r1=390498&r2=390499&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_disk_cache.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_disk_cache.c Fri Mar 31 13:09:58 2006
@@ -991,7 +991,7 @@
                          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 @@
                          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) {



Mime
View raw message