mod_disk_cache renamed to mod_cache_disk, to be consistent with the

naming of other modules.

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

diff --git a/Apache.dsw b/Apache.dsw
index b848ca41d1a54a0545f73b3fca4187f560445b5a..6ac3faf44a864197a161ff504646c9ccc049c248 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -186,7 +186,7 @@ Package=<4>
     Project_Dep_Name mod_dir
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name mod_disk_cache
+    Project_Dep_Name mod_cache_disk
     End Project Dependency
     Begin Project Dependency
     Project_Dep_Name mod_dumpio
@@ -1687,7 +1687,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mod_disk_cache"=.\modules\cache\mod_disk_cache.dsp - Package Owner=<4>
+Project: "mod_cache_disk"=.\modules\cache\mod_cache_disk.dsp - Package Owner=<4>
 
 Package=<5>
 {{{

diff --git a/CHANGES b/CHANGES
index 7e659dfd00773dd962019cf2c1d02e0848e55389..1c736e6c2c5655fbf4e812563c6eec70322174d5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@ Changes with Apache 2.3.9
      Fix a denial of service attack against mod_reqtimeout.
      [Stefan Fritsch]
 
+  *) mod_cache_disk: mod_disk_cache renamed to mod_cache_disk, to be
+     consistent with the naming of other modules. [Graham Leggett]
+
   *) mod_setenvif: Add SetEnvIfExpr directive to set env var depending on
      expression. [Stefan Fritsch]
 

diff --git a/modules/cache/NWGNUdsk_cach b/modules/cache/NWGNUcach_dsk
similarity index 98%
rename from modules/cache/NWGNUdsk_cach
rename to modules/cache/NWGNUcach_dsk
index ce5bb7b92de70469c58de1fcde54819acbd6a539..1287f48a6a34477296aee58463aee172c206634e 100644 (file)
--- a/modules/cache/NWGNUdsk_cach
+++ b/modules/cache/NWGNUcach_dsk
@@ -174,7 +174,7 @@ TARGET_lib = \
 # Paths must all use the '/' character
 #
 FILES_nlm_objs = \
-       $(OBJDIR)/mod_disk_cache.o \
+       $(OBJDIR)/mod_cache_disk.o \
        $(EOLIST)
 
 #
@@ -224,7 +224,7 @@ FILES_nlm_Ximports = \
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
-       disk_cache_module \
+       cache_disk_module \
        $(EOLIST)
 
 #

diff --git a/modules/cache/disk_cache_common.h b/modules/cache/cache_disk_common.h
similarity index 94%
rename from modules/cache/disk_cache_common.h
rename to modules/cache/cache_disk_common.h
index 5c93f261257876ad9f6af52aec2f49132c104be8..d3b858f894832f666ffdc79c30509e39de8c68b7 100644 (file)
--- a/modules/cache/disk_cache_common.h
+++ b/modules/cache/cache_disk_common.h
@@ -15,7 +15,7 @@
  */
 
 /**
- * @file disk_cache_common.h
+ * @file cache_disk_common.h
  * @brief Common Disk Cache vars/structs
  *
  * @defgroup Cache_cache  Cache Functions
@@ -23,8 +23,8 @@
  * @{
  */
 
-#ifndef DISK_CACHE_COMMON_H
-#define DISK_CACHE_COMMON_H
+#ifndef CACHE_DIST_COMMON_H
+#define CACHE_DIST_COMMON_H
 
 #define VARY_FORMAT_VERSION 5
 #define DISK_FORMAT_VERSION 6
@@ -64,4 +64,5 @@ typedef struct {
     cache_control_t control;
 } disk_cache_info_t;
 
-#endif /* DISK_CACHE_COMMON_H */
+#endif /* CACHE_DIST_COMMON_H */
+

diff --git a/modules/cache/config.m4 b/modules/cache/config.m4
index 0c2c89614cb99f9fc3fa394094bb79e067266616..b70ec42332ea46730c7c00a1f232af39b38a0d65 100644 (file)
--- a/modules/cache/config.m4
+++ b/modules/cache/config.m4
@@ -12,18 +12,18 @@ mod_cache.lo dnl
 cache_storage.lo dnl
 cache_util.lo dnl
 "
-disk_cache_objs="mod_disk_cache.lo"
+cache_disk_objs="mod_cache_disk.lo"
 
 case "$host" in
   *os2*)
     # OS/2 DLLs must resolve all symbols at build time
     # and we need some from main cache module
-    disk_cache_objs="$disk_cache_objs mod_cache.la"
+    cache_disk_objs="$cache_disk_objs mod_cache.la"
     ;;
 esac
 
-APACHE_MODULE(cache, dynamic file caching.  At least one storage management module (e.g. mod_disk_cache) is also necessary., $cache_objs, , most)
-APACHE_MODULE(disk_cache, disk caching module, $disk_cache_objs, , most)
+APACHE_MODULE(cache, dynamic file caching.  At least one storage management module (e.g. mod_cache_disk) is also necessary., $cache_objs, , most)
+APACHE_MODULE(cache_disk, disk caching module, $cache_disk_objs, , most)
 
 AC_DEFUN([CHECK_DISTCACHE], [
   AC_CHECK_HEADER(

diff --git a/modules/cache/mod_disk_cache.c b/modules/cache/mod_cache_disk.c
similarity index 98%
rename from modules/cache/mod_disk_cache.c
rename to modules/cache/mod_cache_disk.c
index 5c817e745ef021335d5ff14f6ed087aaf7808917..95216bcd473f27a110a27185b3901e2f175e1957 100644 (file)
--- a/modules/cache/mod_disk_cache.c
+++ b/modules/cache/mod_cache_disk.c
@@ -18,7 +18,7 @@
 #include "apr_file_io.h"
 #include "apr_strings.h"
 #include "mod_cache.h"
-#include "mod_disk_cache.h"
+#include "mod_cache_disk.h"
 #include "http_config.h"
 #include "http_log.h"
 #include "http_core.h"
@@ -55,7 +55,7 @@
  *   CRLF
  */
 
-module AP_MODULE_DECLARE_DATA disk_cache_module;
+module AP_MODULE_DECLARE_DATA cache_disk_module;
 
 /* Forward declarations */
 static int remove_entity(cache_handle_t *h);
@@ -337,9 +337,9 @@ static void tokens_to_array(apr_pool_t *p, const char *data,
 static int create_entity(cache_handle_t *h, request_rec *r, const char *key, apr_off_t len,
                          apr_bucket_brigade *bb)
 {
-    disk_cache_dir_conf *dconf = ap_get_module_config(r->per_dir_config, &disk_cache_module);
+    disk_cache_dir_conf *dconf = ap_get_module_config(r->per_dir_config, &cache_disk_module);
     disk_cache_conf *conf = ap_get_module_config(r->server->module_config,
-                                                 &disk_cache_module);
+                                                 &cache_disk_module);
     cache_object_t *obj;
     disk_cache_object_t *dobj;
     apr_pool_t *pool;
@@ -407,7 +407,7 @@ static int open_entity(cache_handle_t *h, request_rec *r, const char *key)
     apr_status_t rc;
     static int error_logged = 0;
     disk_cache_conf *conf = ap_get_module_config(r->server->module_config,
-                                                 &disk_cache_module);
+                                                 &cache_disk_module);
 #ifdef APR_SENDFILE_ENABLED
     core_dir_config *coreconf = ap_get_module_config(r->per_dir_config,
                                                      &core_module);
@@ -925,7 +925,7 @@ static apr_status_t store_headers(cache_handle_t *h, request_rec *r, cache_info
 static apr_status_t write_headers(cache_handle_t *h, request_rec *r)
 {
     disk_cache_conf *conf = ap_get_module_config(r->server->module_config,
-                                                 &disk_cache_module);
+                                                 &cache_disk_module);
     apr_status_t rv;
     apr_size_t amt;
     disk_cache_object_t *dobj = (disk_cache_object_t*) h->cache_obj->vobj;
@@ -1064,7 +1064,7 @@ static apr_status_t store_body(cache_handle_t *h, request_rec *r,
     apr_bucket *e;
     apr_status_t rv = APR_SUCCESS;
     disk_cache_object_t *dobj = (disk_cache_object_t *) h->cache_obj->vobj;
-    disk_cache_dir_conf *dconf = ap_get_module_config(r->per_dir_config, &disk_cache_module);
+    disk_cache_dir_conf *dconf = ap_get_module_config(r->per_dir_config, &cache_disk_module);
     int seen_eos = 0;
 
     if (!dobj->bb) {
@@ -1255,7 +1255,7 @@ static apr_status_t store_body(cache_handle_t *h, request_rec *r,
 static apr_status_t commit_entity(cache_handle_t *h, request_rec *r)
 {
     disk_cache_conf *conf = ap_get_module_config(r->server->module_config,
-                                                 &disk_cache_module);
+                                                 &cache_disk_module);
     disk_cache_object_t *dobj = (disk_cache_object_t *) h->cache_obj->vobj;
     apr_status_t rv;
 
@@ -1341,7 +1341,7 @@ static const char
 *set_cache_root(cmd_parms *parms, void *in_struct_ptr, const char *arg)
 {
     disk_cache_conf *conf = ap_get_module_config(parms->server->module_config,
-                                                 &disk_cache_module);
+                                                 &cache_disk_module);
     conf->cache_root = arg;
     conf->cache_root_len = strlen(arg);
     /* TODO: canonicalize cache_root and strip off any trailing slashes */
@@ -1359,7 +1359,7 @@ static const char
 *set_cache_dirlevels(cmd_parms *parms, void *in_struct_ptr, const char *arg)
 {
     disk_cache_conf *conf = ap_get_module_config(parms->server->module_config,
-                                                 &disk_cache_module);
+                                                 &cache_disk_module);
     int val = atoi(arg);
     if (val < 1)
         return "CacheDirLevels value must be an integer greater than 0";
@@ -1372,7 +1372,7 @@ static const char
 *set_cache_dirlength(cmd_parms *parms, void *in_struct_ptr, const char *arg)
 {
     disk_cache_conf *conf = ap_get_module_config(parms->server->module_config,
-                                                 &disk_cache_module);
+                                                 &cache_disk_module);
     int val = atoi(arg);
     if (val < 1)
         return "CacheDirLength value must be an integer greater than 0";
@@ -1478,7 +1478,7 @@ static void disk_cache_register_hook(apr_pool_t *p)
                          &cache_disk_provider);
 }
 
-AP_DECLARE_MODULE(disk_cache) = {
+AP_DECLARE_MODULE(cache_disk) = {
     STANDARD20_MODULE_STUFF,
     create_dir_config,          /* create per-directory config structure */
     merge_dir_config,           /* merge per-directory config structures */

diff --git a/modules/cache/mod_disk_cache.dsp b/modules/cache/mod_cache_disk.dsp
similarity index 71%
rename from modules/cache/mod_disk_cache.dsp
rename to modules/cache/mod_cache_disk.dsp
index 91799b8540262b3ea3292ba42719afe12a109bf0..19ca39e6b180879a024012c52ef86bb95c1dceb9 100644 (file)
--- a/modules/cache/mod_disk_cache.dsp
+++ b/modules/cache/mod_cache_disk.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="mod_disk_cache" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="mod_cache_disk" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=mod_disk_cache - Win32 Debug
+CFG=mod_cache_disk - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "mod_disk_cache.mak".
+!MESSAGE NMAKE /f "mod_cache_disk.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "mod_disk_cache.mak" CFG="mod_disk_cache - Win32 Debug"
+!MESSAGE NMAKE /f "mod_cache_disk.mak" CFG="mod_cache_disk - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "mod_disk_cache - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "mod_disk_cache - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "mod_cache_disk - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "mod_cache_disk - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "mod_disk_cache - Win32 Release"
+!IF  "$(CFG)" == "mod_cache_disk - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -43,25 +43,25 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../srclib/apr-util/include" /I "../../srclib/apr/include" /I "../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fd"Release\mod_disk_cache_src" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../srclib/apr-util/include" /I "../../srclib/apr/include" /I "../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fd"Release\mod_cache_disk_src" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /fo"Release/mod_disk_cache.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d BIN_NAME="mod_disk_cache.so" /d LONG_NAME="disk_cache_module for Apache"
+# ADD RSC /l 0x409 /fo"Release/mod_cache_disk.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d BIN_NAME="mod_cache_disk.so" /d LONG_NAME="cache_disk_module for Apache"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Release\mod_disk_cache.so" /base:@..\..\os\win32\BaseAddr.ref,mod_disk_cache.so /opt:ref
+# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Release\mod_cache_disk.so" /base:@..\..\os\win32\BaseAddr.ref,mod_cache_disk.so /opt:ref
 # Begin Special Build Tool
-TargetPath=.\Release\mod_disk_cache.so
+TargetPath=.\Release\mod_cache_disk.so
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
 PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
 # End Special Build Tool
 
-!ELSEIF  "$(CFG)" == "mod_disk_cache - Win32 Debug"
+!ELSEIF  "$(CFG)" == "mod_cache_disk - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -75,19 +75,19 @@ PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).ma
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../../srclib/apr-util/include" /I "../../srclib/apr/include" /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fd"Debug\mod_disk_cache_src" /FD /c
+# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../../srclib/apr-util/include" /I "../../srclib/apr/include" /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fd"Debug\mod_cache_disk_src" /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /fo"Debug/mod_disk_cache.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d BIN_NAME="mod_disk_cache.so" /d LONG_NAME="disk_cache_module for Apache"
+# ADD RSC /l 0x409 /fo"Debug/mod_cache_disk.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d BIN_NAME="mod_cache_disk.so" /d LONG_NAME="cache_disk_module for Apache"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_disk_cache.so" /base:@..\..\os\win32\BaseAddr.ref,mod_disk_cache.so
+# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_cache_disk.so" /base:@..\..\os\win32\BaseAddr.ref,mod_cache_disk.so
 # Begin Special Build Tool
-TargetPath=.\Debug\mod_disk_cache.so
+TargetPath=.\Debug\mod_cache_disk.so
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
 PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
@@ -97,15 +97,15 @@ PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).ma
 
 # Begin Target
 
-# Name "mod_disk_cache - Win32 Release"
-# Name "mod_disk_cache - Win32 Debug"
+# Name "mod_cache_disk - Win32 Release"
+# Name "mod_cache_disk - Win32 Debug"
 # Begin Source File
 
 SOURCE=.\mod_cache.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\mod_disk_cache.c
+SOURCE=.\mod_cache_disk.c
 # End Source File
 # Begin Source File
 

diff --git a/modules/cache/mod_disk_cache.h b/modules/cache/mod_cache_disk.h
similarity index 94%
rename from modules/cache/mod_disk_cache.h
rename to modules/cache/mod_cache_disk.h
index 3d3e3debdc1ac1ecb319e06ddb7e9b8c20f5ea20..550f2a05cb45fb8dd1c759a68d84a02c30c4f9c3 100644 (file)
--- a/modules/cache/mod_disk_cache.h
+++ b/modules/cache/mod_cache_disk.h
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-#ifndef MOD_DISK_CACHE_H
-#define MOD_DISK_CACHE_H
+#ifndef MOD_CACHE_DISK_H
+#define MOD_CACHE_DISK_H
 
 #include "apr_file_io.h"
 
-#include "disk_cache_common.h"
+#include "cache_disk_common.h"
 
 /*
- * include for mod_disk_cache: Disk Based HTTP 1.1 Cache.
+ * include for mod_cache_disk: Disk Based HTTP 1.1 Cache.
  */
 
 typedef struct {
@@ -59,7 +59,7 @@ typedef struct disk_cache_object {
 
 
 /*
- * mod_disk_cache configuration
+ * mod_cache_disk configuration
  */
 /* TODO: Make defaults OS specific */
 #define CACHEFILE_LEN 20        /* must be less than HASH_LEN/2 */
@@ -88,4 +88,5 @@ typedef struct {
     int readtime_set:1;
 } disk_cache_dir_conf;
 
-#endif /*MOD_DISK_CACHE_H*/
+#endif /*MOD_CACHE_DISK_H*/
+

diff --git a/support/htcacheclean.c b/support/htcacheclean.c
index 8002e9fea5d2bd8224b6995b6779787721d2a647..311dbcd05db798b1c60456a1cda2d0de19cf425c 100644 (file)
--- a/support/htcacheclean.c
+++ b/support/htcacheclean.c
@@ -38,7 +38,7 @@
 #include "apr_buckets.h"
 
 #include "../modules/cache/cache_common.h"
-#include "../modules/cache/disk_cache_common.h"
+#include "../modules/cache/cache_disk_common.h"
 
 #if APR_HAVE_UNISTD_H
 #include <unistd.h>