httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r1026612 - /httpd/httpd/trunk/modules/cache/mod_disk_cache.c
Date Sat, 23 Oct 2010 12:36:24 GMT
Author: minfrin
Date: Sat Oct 23 12:36:23 2010
New Revision: 1026612

URL: http://svn.apache.org/viewvc?rev=1026612&view=rev
Log:
mod_disk_cache: Make sure we step down cleanly when we've ben configured
to cache but haven't set a CacheRoot.

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/viewvc/httpd/httpd/trunk/modules/cache/mod_disk_cache.c?rev=1026612&r1=1026611&r2=1026612&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_disk_cache.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_disk_cache.c Sat Oct 23 12:36:23 2010
@@ -1147,12 +1147,16 @@ static apr_status_t store_body(cache_han
                                  APR_CREATE | APR_WRITE | APR_BINARY |
                                  APR_BUFFERED | APR_EXCL, dobj->data.pool);
             if (rv != APR_SUCCESS) {
+                apr_pool_destroy(dobj->data.pool);
+                APR_BRIGADE_CONCAT(out, dobj->bb);
                 return rv;
             }
             dobj->file_size = 0;
             rv = apr_file_info_get(&finfo, APR_FINFO_IDENT,
                     dobj->data.tempfd);
             if (rv != APR_SUCCESS) {
+                apr_pool_destroy(dobj->data.pool);
+                APR_BRIGADE_CONCAT(out, dobj->bb);
                 return rv;
             }
             dobj->disk_info.device = finfo.device;



Mime
View raw message