From: Eric Covener <covener@apache.org>
Date: Sun, 4 Nov 2012 03:22:33 +0000 (+0000)
Subject:   *) mod_cache_disk: Resolve errors while revalidating disk-cached files on
X-Git-Tag: 2.5.0-alpha~6165
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43f03d940704cda74ccfeb21d4895e5c49e729dd;p=thirdparty%2Fapache%2Fhttpd.git

  *) mod_cache_disk: Resolve errors while revalidating disk-cached files on
     Windows ("...rename tempfile to datafile failed..."). PR 38827
     [Eric Covener]



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

diff --git a/CHANGES b/CHANGES
index 664e780629f..08dc1983099 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
+ 
+  *) mod_cache_disk: Resolve errors while revalidating disk-cached files on 
+     Windows ("...rename tempfile to datafile failed..."). PR 38827
+     [Eric Covener]
 
   *) mod_proxy: Add ability to configure the sticky session separator.
      PR 53893. [<inu inusasha de>, Jim Jagielski]
diff --git a/modules/cache/mod_cache_disk.c b/modules/cache/mod_cache_disk.c
index 55f628fa2cb..a024b7176fe 100644
--- a/modules/cache/mod_cache_disk.c
+++ b/modules/cache/mod_cache_disk.c
@@ -596,6 +596,11 @@ static int open_entity(cache_handle_t *h, request_rec *r, const char *key)
 
 static int remove_entity(cache_handle_t *h)
 {
+    disk_cache_object_t *dobj = (disk_cache_object_t *) h->cache_obj->vobj;
+    if (dobj->fd != NULL) {
+        apr_file_close(dobj->fd);
+    }
+
     /* Null out the cache object pointer so next time we start from scratch  */
     h->cache_obj = NULL;
     return OK;