From: Rainer Jung <rjung@apache.org>
Date: Sun, 18 Jan 2009 00:47:00 +0000 (+0000)
Subject: Remove some more mod_mem_cache relics from
X-Git-Tag: 2.3.2~149
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a5f27a0dbcb5858b5151738272976b14a747215c;p=apache

Remove some more mod_mem_cache relics from
trunk and add removal to CHANGES.

The module has been removed in r711470.


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

diff --git a/CHANGES b/CHANGES
index 08109bd94c..b971f48add 100644
--- a/CHANGES
+++ b/CHANGES
@@ -152,6 +152,8 @@ Changes with Apache 2.3.0
      and to enable different virtualhosts to run with different
      privileges and Unix user/group IDs [Nick Kew]
 
+  *) mod_mem_cache: this module has been removed. [William Rowe]
+
   *) authn/z: Remove mod_authn_default and mod_authz_default.
      [Chris Darroch]
 
@@ -266,7 +268,7 @@ Changes with Apache 2.3.0
      overwritten. PR 44262 [Michał Grzędzicki <lazy iq.pl>]
 
   *) ap_cache_cacheable_headers_out() will (now) always
-     merge an error heaeders _before_ clearing them and _before_
+     merge an error headers _before_ clearing them and _before_
      merging in the actual entity headers and doing normal
      hop-by-hop cleansing. [Dirk-Willem van Gulik].
 
diff --git a/Makefile.win b/Makefile.win
index d91bbc5ff7..12a0c88625 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -302,7 +302,6 @@ _build:
 	cd modules\cache
 	 $(MAKE) $(MAKEOPT) -f mod_cache.mak       CFG="mod_cache - 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_mem_cache.mak   CFG="mod_mem_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)
 !IFDEF ALL
@@ -525,7 +524,6 @@ _copybin:
 	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_file_cache.$(src_so) 	"$(inst_so)" <.y
-	copy modules\cache\$(LONG)\mod_mem_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
diff --git a/build/installwinconf.awk b/build/installwinconf.awk
index b5d87776a7..c2754f12df 100644
--- a/build/installwinconf.awk
+++ b/build/installwinconf.awk
@@ -138,7 +138,6 @@ BEGIN {
 	  print "#LoadModule logio_module modules/mod_logio.so" > dstfl;
 	  print "LoadModule log_config_module modules/mod_log_config.so" > dstfl;
 	  print "#LoadModule log_forensic_module modules/mod_log_forensic.so" > dstfl;
-	  print "#LoadModule mem_cache_module modules/mod_mem_cache.so" > dstfl;
 	  print "LoadModule mime_module modules/mod_mime.so" > dstfl;
 	  print "#LoadModule mime_magic_module modules/mod_mime_magic.so" > dstfl;
 	  print "LoadModule negotiation_module modules/mod_negotiation.so" > dstfl;
diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref
index 72991ce330..77d738a3c9 100644
--- a/os/win32/BaseAddr.ref
+++ b/os/win32/BaseAddr.ref
@@ -46,7 +46,6 @@ mod_setenvif.so         0x6FC00000    0x00010000
 mod_userdir.so          0x6FBF0000    0x00010000
 mod_cache.so            0x6FBE0000    0x00010000
 mod_disk_cache.so       0x6FBD0000    0x00010000
-mod_mem_cache.so        0x6FBC0000    0x00010000
 mod_deflate.so          0x6FBA0000    0x00020000
 mod_ext_filter.so       0x6FB90000    0x00010000
 mod_charset_lite.so     0x6FB80000    0x00010000
@@ -96,3 +95,6 @@ mod_socache_dc.so       0x6F8A0000    0x00010000
 mod_socache_memcache.so 0x6F890000    0x00010000
 mod_socache_shmcb.so    0x6F880000    0x00010000
 mod_sed.so              0x6F870000    0x00010000
+; These modules were removed,
+; their base addresses can be reused.
+;mod_mem_cache.so        0x6FBC0000    0x00010000