Further trivial updates mod_disk_cache -> mod_cache_disk.

No functional change.

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

diff --git a/STATUS b/STATUS
index e6253707b82e6cb706dd4fa6ace0970edb95e18d..960b450da403ba59c18f59b943a0f924fd163b98 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -394,7 +394,7 @@ WISH LIST
     line server hooks (Ryan really hated this. It is great for
     performance, but bad because of the complications listed above).
 
-    mod_cache/mod_mem_cache/mod_disk_cache:
+    mod_cache/mod_mem_cache/mod_cache_disk:
 
   * mod_mem_cache: Consider adding a RevalidateTimeout directive to
     specify time at which local cached content is to be revalidated
@@ -404,7 +404,7 @@ WISH LIST
     jerenkrantz says: Too slow.  Get regexs away from speedy caches by
                       default.  Introduce a new CacheEnableRegex if you want.
 
-  * mod_mem_cache/mod_disk_cache: Need to be able to query cache
+  * mod_mem_cache/mod_cache_disk: Need to be able to query cache
     status (num of entries, cache object properties, etc.).
     mod_status could be extended to query optional hooks defined
     by modules for the purpose of reporting module status.

diff --git a/build/rpm/htcacheclean.init b/build/rpm/htcacheclean.init
index 5309b2af3887da7ea9a26e8dacb880365353a14d..df30f1af3157aa837d89b2633dae51deb1b73a8f 100755 (executable)
--- a/build/rpm/htcacheclean.init
+++ b/build/rpm/htcacheclean.init
@@ -20,7 +20,7 @@
 #
 # chkconfig: - 85 15
 # description: The Apache htcacheclean daemon maintains and prunes the
-#              size of the mod_disk_cache cache directory.
+#              size of the mod_cache_disk cache directory.
 # processname: htcacheclean
 # pidfile: /var/log/httpd/htcacheclean.pid
 # config: /etc/sysconfig/htcacheclean
@@ -31,7 +31,7 @@
 # Required-Stop: $local_fs $remote_fs $network
 # Should-Start: httpd
 # Short-Description: start and stop Apache htcacheclean
-# Description: The Apache htcacheclean daemon maintains a mod_disk_cache
+# Description: The Apache htcacheclean daemon maintains a mod_cache_disk
 ### END INIT INFO
 
 # Source function library.

diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
index 48bb74de76fb7bbb1e7af609f68a4c23d3cec499..3e8a5d671f1486a5e35adc63aa9e839d4d1bb331 100644 (file)
--- a/modules/cache/mod_cache.c
+++ b/modules/cache/mod_cache.c
@@ -1374,7 +1374,7 @@ static int cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in)
 
             rv = cache->provider->remove_url(cache->stale_handle, r);
             if (rv != OK) {
-                /* Probably a mod_disk_cache cache area has been (re)mounted
+                /* Probably a mod_cache_disk cache area has been (re)mounted
                  * read-only, or that there is a permissions problem.
                  */
                 ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r,

diff --git a/modules/cache/mod_cache_disk.c b/modules/cache/mod_cache_disk.c
index ca07138d3ea3b658ff1e232191f9f99d3052a97c..11b66c308c55291dc79ff2973ff47e93584994e9 100644 (file)
--- a/modules/cache/mod_cache_disk.c
+++ b/modules/cache/mod_cache_disk.c
@@ -1335,7 +1335,7 @@ static void *create_config(apr_pool_t *p, server_rec *s)
 }
 
 /*
- * mod_disk_cache configuration directives handlers.
+ * mod_cache_disk configuration directives handlers.
  */
 static const char
 *set_cache_root(cmd_parms *parms, void *in_struct_ptr, const char *arg)

diff --git a/support/README b/support/README
index 020a6bcfcda455db37e776c45173b842aca5609c..09dadb2ceb819732a3f378c8264f7258ae4e01a8 100644 (file)
--- a/support/README
+++ b/support/README
@@ -18,7 +18,7 @@ dbmmanage
        DBM format used by mod_auth_db.
 
 htcacheclean
-    Keep the size of mod_disk_cache store within a certain limit.
+    Keep the size of mod_cache_disk store within a certain limit.
 
 htdigest
        Create and update user authentication files used in