httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cove...@apache.org
Subject svn commit: r1405494 - in /httpd/httpd/trunk: CHANGES modules/cache/mod_cache_disk.c
Date Sun, 04 Nov 2012 03:22:33 GMT
Author: covener
Date: Sun Nov  4 03:22:33 2012
New Revision: 1405494

URL: http://svn.apache.org/viewvc?rev=1405494&view=rev
Log:
  *) mod_cache_disk: Resolve errors while revalidating disk-cached files on 
     Windows ("...rename tempfile to datafile failed..."). PR 38827
     [Eric Covener]


Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/cache/mod_cache_disk.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1405494&r1=1405493&r2=1405494&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Sun Nov  4 03:22:33 2012
@@ -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]

Modified: httpd/httpd/trunk/modules/cache/mod_cache_disk.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_cache_disk.c?rev=1405494&r1=1405493&r2=1405494&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_cache_disk.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_cache_disk.c Sun Nov  4 03:22:33 2012
@@ -596,6 +596,11 @@ static int open_entity(cache_handle_t *h
 
 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;



Mime
View raw message