You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rj...@apache.org on 2009/01/18 01:47:00 UTC

svn commit: r735365 - in /httpd/httpd/trunk: CHANGES Makefile.win build/installwinconf.awk os/win32/BaseAddr.ref

Author: rjung
Date: Sat Jan 17 16:47:00 2009
New Revision: 735365

URL: http://svn.apache.org/viewvc?rev=735365&view=rev
Log:
Remove some more mod_mem_cache relics from
trunk and add removal to CHANGES.

The module has been removed in r711470.

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/Makefile.win
    httpd/httpd/trunk/build/installwinconf.awk
    httpd/httpd/trunk/os/win32/BaseAddr.ref

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=735365&r1=735364&r2=735365&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Sat Jan 17 16:47:00 2009
@@ -152,6 +152,8 @@
      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 @@
      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].
 

Modified: httpd/httpd/trunk/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Makefile.win?rev=735365&r1=735364&r2=735365&view=diff
==============================================================================
--- httpd/httpd/trunk/Makefile.win (original)
+++ httpd/httpd/trunk/Makefile.win Sat Jan 17 16:47:00 2009
@@ -302,7 +302,6 @@
 	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 @@
 	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

Modified: httpd/httpd/trunk/build/installwinconf.awk
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/installwinconf.awk?rev=735365&r1=735364&r2=735365&view=diff
==============================================================================
--- httpd/httpd/trunk/build/installwinconf.awk (original)
+++ httpd/httpd/trunk/build/installwinconf.awk Sat Jan 17 16:47:00 2009
@@ -138,7 +138,6 @@
 	  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;

Modified: httpd/httpd/trunk/os/win32/BaseAddr.ref
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/win32/BaseAddr.ref?rev=735365&r1=735364&r2=735365&view=diff
==============================================================================
--- httpd/httpd/trunk/os/win32/BaseAddr.ref (original)
+++ httpd/httpd/trunk/os/win32/BaseAddr.ref Sat Jan 17 16:47:00 2009
@@ -46,7 +46,6 @@
 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_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