Incorperate feedback of Rudiger.

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

diff --git a/modules/cache/mod_disk_cache.c b/modules/cache/mod_disk_cache.c
index 3e991156cb1e7a7211a600497454aeac49a7d76c..c1c1af6cddc8e253dc28981398ae907b87f6fb81 100644 (file)
--- a/modules/cache/mod_disk_cache.c
+++ b/modules/cache/mod_disk_cache.c
@@ -854,13 +854,6 @@ static apr_status_t store_headers(cache_handle_t *h, request_rec *r, cache_info
 
             rv = mkdir_structure(conf, dobj->hdrsfile, r->pool);
 
-            if (rv != APR_SUCCESS) {
-                ap_log_error(APLOG_MARK, APLOG_WARNING, rv, r->server,
-                    "disk_cache: could not create directory path to %s",
-                    dobj->hdrsfile);
-                return rv;
-            }
-
             rv = apr_file_mktemp(&dobj->tfd, dobj->tempfile,
                                  APR_CREATE | APR_WRITE | APR_BINARY | APR_EXCL,
                                  r->pool);
@@ -893,6 +886,7 @@ static apr_status_t store_headers(cache_handle_t *h, request_rec *r, cache_info
                 ap_log_error(APLOG_MARK, APLOG_WARNING, rv, r->server,
                     "disk_cache: rename tempfile to varyfile failed: %s -> %s",
                     dobj->tempfile, dobj->hdrsfile);
+                    apr_file_remove(dobj->tempfile, r->pool);
                 return rv;
             }
 
@@ -988,12 +982,6 @@ static apr_status_t store_headers(cache_handle_t *h, request_rec *r, cache_info
     rv = apr_file_remove(dobj->hdrsfile, r->pool);
     if (rv != APR_SUCCESS) {
         rv = mkdir_structure(conf, dobj->hdrsfile, r->pool);
-        if (rv != APR_SUCCESS) {
-            ap_log_error(APLOG_MARK, APLOG_WARNING, rv, r->server,
-                     "disk_cache: creating directories for hdrsfile %s failed",
-                     dobj->hdrsfile);
-            return rv;
-        }
     }
 
     rv = safe_file_rename(conf, dobj->tempfile, dobj->hdrsfile, r->pool);