Turn the cache module into first class citizens (well the disk_cache

and file cache that is).

This makes the delta between 'all' and 'most'

mod_cern_meta.c
mod_log_forensic.c
mod_mime_magic.c
mod_unique_id.c
mod_usertrack.c
mod_version.c
mod_mem_cache.c

And keeps disabled in all and most the modules for:

authnz_ldap
bucketeer
echo
example_hooks
case_filter
case_filter_in
example_ipc
charset_lite
cgid
ldap
optional_hook_export
optional_hook_import
optional_fn_import
optional_fn_export

As well as mod_ssl which is intentionally not part of MOST and All.

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

diff --git a/CHANGES b/CHANGES
index 8f159215102af016f7eaa4d8d196bd389268b754..40e6aa62c8b5213aef03c21ce049a5cc3e504fc2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
 Changes with Apache 2.3.0
 [ When backported to 2.2.x, remove entry from this file ]
 
+  *) Activate mod_cache, mod_file_cache and mod_disc_cache as part of the
+     'most' set for '--enable-modules' and '--enable-shared-mods'. Include 
+     mod_mem_cache in 'all' as well. [Dirk-Willem van Gulik]
+
   *) Also install mod_so.h, mod_rewrite.h and mod_cache.h; as these
      contain public function declarations which are useful for
      third party module authors. PR 42431 [Dirk-Willem van Gulik].

diff --git a/modules/cache/config.m4 b/modules/cache/config.m4
index 9572e06d5bdf7e7bd63fedda183c7bdef48f95e3..9eae493c3b5baa0bc9ae7c821fe6046ca3fdceeb 100644 (file)
--- a/modules/cache/config.m4
+++ b/modules/cache/config.m4
@@ -4,7 +4,7 @@ dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
 
 APACHE_MODPATH_INIT(cache)
 
-APACHE_MODULE(file_cache, File cache, , , no)
+APACHE_MODULE(file_cache, File cache, , , most)
 
 dnl #  list of object files for mod_cache
 cache_objs="dnl
@@ -18,9 +18,10 @@ mod_mem_cache.lo dnl
 cache_cache.lo dnl
 cache_pqueue.lo dnl
 cache_hash.lo dnl
+cache_util.lo dnl
 "
-APACHE_MODULE(cache, dynamic file caching, $cache_objs, , no)
-APACHE_MODULE(disk_cache, disk caching module, , , no)
-APACHE_MODULE(mem_cache, memory caching module, $mem_cache_objs, , no)
+APACHE_MODULE(cache, dynamic file caching, $cache_objs, , most)
+APACHE_MODULE(disk_cache, disk caching module, , , most)
+APACHE_MODULE(mem_cache, memory caching module, $mem_cache_objs, , )
 
 APACHE_MODPATH_FINISH