You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2005/09/18 23:17:56 UTC

svn commit: r289977 - in /httpd/httpd/branches/2.2.x/support: README htcacheclean.c

Author: colm
Date: Sun Sep 18 14:17:54 2005
New Revision: 289977

URL: http://svn.apache.org/viewcvs?rev=289977&view=rev
Log:

Backport two small htcacheclean fixes from trunk to the 2.2.x branch;

    1.) Open the cache files as binary types, so that htcacheclean can
        work properly on Windows.

    2.) Add an entry in support/README for htcacheclean


Modified:
    httpd/httpd/branches/2.2.x/support/README
    httpd/httpd/branches/2.2.x/support/htcacheclean.c

Modified: httpd/httpd/branches/2.2.x/support/README
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/support/README?rev=289977&r1=289976&r2=289977&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/support/README (original)
+++ httpd/httpd/branches/2.2.x/support/README Sun Sep 18 14:17:54 2005
@@ -17,6 +17,9 @@
 	Create and update user authentication files in the faster
 	DBM format used by mod_auth_db.
 
+htcacheclean
+    Keep the size of mod_disk_cache store within a certain limit.
+
 htdigest
 	Create and update user authentication files used in
 	DIGEST authentification. See mod_auth_digest.

Modified: httpd/httpd/branches/2.2.x/support/htcacheclean.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/support/htcacheclean.c?rev=289977&r1=289976&r2=289977&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/support/htcacheclean.c (original)
+++ httpd/httpd/branches/2.2.x/support/htcacheclean.c Sun Sep 18 14:17:54 2005
@@ -497,8 +497,8 @@
         case HEADERDATA:
             nextpath = apr_pstrcat(p, path, "/", d->basename,
                                    CACHE_HEADER_SUFFIX, NULL);
-            if (apr_file_open(&fd, nextpath, APR_READ, APR_OS_DEFAULT,
-                              p) == APR_SUCCESS) {
+            if (apr_file_open(&fd, nextpath, APR_FOPEN_READ | APR_FOPEN_BINARY, 
+                              APR_OS_DEFAULT, p) == APR_SUCCESS) {
                 len = sizeof(format);
                 if (apr_file_read_full(fd, &format, len, 
                                        &len) == APR_SUCCESS) {
@@ -570,8 +570,8 @@
             current = apr_time_now();
             nextpath = apr_pstrcat(p, path, "/", d->basename,
                                    CACHE_HEADER_SUFFIX, NULL);
-            if (apr_file_open(&fd, nextpath, APR_READ, APR_OS_DEFAULT,
-                              p) == APR_SUCCESS) {
+            if (apr_file_open(&fd, nextpath, APR_FOPEN_READ | APR_FOPEN_BINARY, 
+                              APR_OS_DEFAULT, p) == APR_SUCCESS) {
                 len = sizeof(format);
                 if (apr_file_read_full(fd, &format, len, 
                                        &len) == APR_SUCCESS) {