Fix Windows build of mod_cache_disk which was broken after

renaming the module.

Submitted by: Gregg L. Smith <lists glsnet net>

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

diff --git a/CHANGES b/CHANGES
index 14832efa23a239822818450ea8359d0acaa98b48..7c0dc7ba05b2bf98f8eede2c5be1c67332b14388 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
 
 Changes with Apache 2.3.10
 
+  *) mod_cache_disk: Fix Windows build which was broken after renaming
+     the module. [Gregg L. Smith]
 
 Changes with Apache 2.3.9
 

diff --git a/Makefile.win b/Makefile.win
index b4a1a6f425b44a8aa1d0e44d8810610959e016d4..dd066c050d8aaf21236442efd3dbca952f45a78f 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -377,8 +377,8 @@ _build:
        cd ..\..\..
        cd modules\cache
         $(MAKE) $(MAKEOPT) -f mod_cache.mak       CFG="mod_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f mod_cache_disk.mak  CFG="mod_cache_disk - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_file_cache.mak  CFG="mod_file_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-        $(MAKE) $(MAKEOPT) -f mod_disk_cache.mak  CFG="mod_disk_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_socache_dbm.mak CFG="mod_socache_dbm - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 #       $(MAKE) $(MAKEOPT) -f mod_socache_dc.mak  CFG="mod_socache_dc - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_socache_memcache.mak CFG="mod_socache_memcache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -637,8 +637,8 @@ _copybin:
        copy modules\aaa\$(LONG)\mod_authz_user.$(src_so)       "$(inst_so)" <.y
        copy modules\arch\win32\$(LONG)\mod_isapi.$(src_so)     "$(inst_so)" <.y
        copy modules\cache\$(LONG)\mod_cache.$(src_so)          "$(inst_so)" <.y
+       copy modules\cache\$(LONG)\mod_cache_disk.$(src_so)     "$(inst_so)" <.y
        copy modules\cache\$(LONG)\mod_file_cache.$(src_so)     "$(inst_so)" <.y
-       copy modules\cache\$(LONG)\mod_disk_cache.$(src_so)     "$(inst_so)" <.y
        copy modules\cache\$(LONG)\mod_socache_dbm.$(src_so)    "$(inst_so)" <.y
 #      copy modules\cache\$(LONG)\mod_socache_dc.$(src_so)     "$(inst_so)" <.y
        copy modules\cache\$(LONG)\mod_socache_memcache.$(src_so) "$(inst_so)" <.y

diff --git a/build/installwinconf.awk b/build/installwinconf.awk
index d687c9e1b8c5d35c5455706df720baa041b694b5..21099ef14b9325057bf3d69ca1b170f1ec6591c8 100644 (file)
--- a/build/installwinconf.awk
+++ b/build/installwinconf.awk
@@ -112,6 +112,7 @@ BEGIN {
          print "LoadModule authz_user_module modules/mod_authz_user.so" > dstfl;
          print "LoadModule autoindex_module modules/mod_autoindex.so" > dstfl;
          print "#LoadModule cache_module modules/mod_cache.so" > dstfl;
+         print "#LoadModule cache_disk_module modules/mod_cache_disk.so" > dstfl;
          print "#LoadModule cern_meta_module modules/mod_cern_meta.so" > dstfl;
          print "LoadModule cgi_module modules/mod_cgi.so" > dstfl;
          print "#LoadModule charset_lite_module modules/mod_charset_lite.so" > dstfl;
@@ -121,7 +122,6 @@ BEGIN {
          print "#LoadModule dbd_module modules/mod_dbd.so" > dstfl;
          print "#LoadModule deflate_module modules/mod_deflate.so" > dstfl;
          print "LoadModule dir_module modules/mod_dir.so" > dstfl;
-         print "#LoadModule disk_cache_module modules/mod_disk_cache.so" > dstfl;
          print "#LoadModule dumpio_module modules/mod_dumpio.so" > dstfl;
          print "LoadModule env_module modules/mod_env.so" > dstfl;
          print "#LoadModule expires_module modules/mod_expires.so" > dstfl;

diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref
index 937e3f4223ea18f08b9f17778b2811945006a334..324a48649314c305fa6294640ef8f46696fc016b 100644 (file)
--- a/os/win32/BaseAddr.ref
+++ b/os/win32/BaseAddr.ref
@@ -45,7 +45,7 @@ mod_negotiation.so          0x6FC10000    0x00010000
 mod_setenvif.so             0x6FC00000    0x00010000
 mod_userdir.so              0x6FBF0000    0x00010000
 mod_cache.so                0x6FBE0000    0x00010000
-mod_disk_cache.so           0x6FBD0000    0x00010000
+mod_cache_disk.so           0x6FBD0000    0x00010000
 mod_buffer.so               0x6FBC0000    0x00010000
 mod_deflate.so              0x6FBA0000    0x00020000
 mod_ext_filter.so           0x6FB90000    0x00010000