Change module sets and default activation status:

1) Promoted from "most" to "yes/few"

- mod_headers

2) Demoted from "yes/few" to "most"

- mod_actions
- mod_allowmethods
- mod_auth_form
- mod_buffer
- mod_cgi(d)
- mod_include
- mod_negotiation
- mod_ratelimit
- mod_request
- mod_userdir

Remember: default module set is "most",
but only the LoadModule lines of all
modules except "yes/few" are commented out by default.

The following modules will now be loaded by default:

- mod_access_compat
- mod_alias
- mod_auth_basic
- mod_authn_core
- mod_authn_file
- mod_authz_core
- mod_authz_groupfile
- mod_authz_host
- mod_authz_user
- mod_autoindex
- mod_dir
- mod_env
- mod_filter
- mod_headers
- mod_log_config
- mod_mime
- mod_mpm_event
- mod_reqtimeout
- mod_setenvif
- mod_status
- mod_unixd
- mod_version

Backport of r1201111 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201118 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 5d8467e68cd851282e0902dc919355b2feb3bc73..048187295566f3a44e14fa50c093f58437719c6b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,12 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.3.16
 
+  *) configure: Additional modules loaded by default: mod_headers.
+     Modules moved from module set "few" to "most" and no longer loaded
+     by default: mod_actions, mod_allowmethods, mod_auth_form, mod_buffer,
+     mod_cgi(d), mod_include, mod_negotiation, mod_ratelimit, mod_request,
+     mod_userdir. [Rainer Jung]
+
   *) mod_lua: Use the right lua scope when used as a hook. [Rainer Jung]
 
   *) configure: Only load the really imporant modules (i.e. those enabled by

diff --git a/modules/aaa/config.m4 b/modules/aaa/config.m4
index aa324ccb0d5fd3244341df6c155d9bb916f4d285..4f3ba4f73914d3df89e7ee1861cb91df80f17061 100644 (file)
--- a/modules/aaa/config.m4
+++ b/modules/aaa/config.m4
@@ -63,7 +63,7 @@ APACHE_MODULE(access_compat, mod_access compatibility, , , yes)
 dnl these are the front-end authentication modules
 
 APACHE_MODULE(auth_basic, basic authentication, , , yes)
-APACHE_MODULE(auth_form, form authentication, , , yes)
+APACHE_MODULE(auth_form, form authentication, , , most)
 APACHE_MODULE(auth_digest, RFC2617 Digest authentication, , , most, [
   APR_CHECK_APR_DEFINE(APR_HAS_RANDOM)
   if test $ac_cv_define_APR_HAS_RANDOM = "no"; then
@@ -73,7 +73,7 @@ APACHE_MODULE(auth_digest, RFC2617 Digest authentication, , , most, [
   fi
 ])
 
-APACHE_MODULE(allowmethods, restrict allowed HTTP methods, , , yes)
+APACHE_MODULE(allowmethods, restrict allowed HTTP methods, , , most)
 
 APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
 

diff --git a/modules/filters/config.m4 b/modules/filters/config.m4
index 2bea5689e396d6f80e3c8a82b1dd2ca52912a6cd..4ef2d3a59f2118a44c26b3ced3dd1002cce96bb3 100644 (file)
--- a/modules/filters/config.m4
+++ b/modules/filters/config.m4
@@ -4,13 +4,13 @@ dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
 
 APACHE_MODPATH_INIT(filters)
 
-APACHE_MODULE(buffer, Filter Buffering, , , yes)
+APACHE_MODULE(buffer, Filter Buffering, , , most)
 APACHE_MODULE(data, RFC2397 data encoder, , , )
-APACHE_MODULE(ratelimit, Output Bandwidth Limiting, , , yes)
+APACHE_MODULE(ratelimit, Output Bandwidth Limiting, , , most)
 APACHE_MODULE(reqtimeout, Limit time waiting for request from client, , , yes)
 APACHE_MODULE(ext_filter, external filter module, , , most)
-APACHE_MODULE(request, Request Body Filtering, , , yes)
-APACHE_MODULE(include, Server Side Includes, , , yes)
+APACHE_MODULE(request, Request Body Filtering, , , most)
+APACHE_MODULE(include, Server Side Includes, , , most)
 APACHE_MODULE(filter, Smart Filtering, , , yes)
 APACHE_MODULE(reflector, Reflect request through the output filter stack, , , )
 APACHE_MODULE(substitute, response content rewrite-like filtering, , , most)

diff --git a/modules/generators/config5.m4 b/modules/generators/config5.m4
index e87a5709754eccd4831aeab488108647fcb2ce59..bf295217e003127136bf70823b6a0b10889521dd 100644 (file)
--- a/modules/generators/config5.m4
+++ b/modules/generators/config5.m4
@@ -32,7 +32,7 @@ case $host in
 esac
 
 if test $cgid_needed = "yes"; then
-    APACHE_MODULE(cgid, CGI scripts.  Enabled by default with threaded MPMs, , , yes, [
+    APACHE_MODULE(cgid, CGI scripts.  Enabled by default with threaded MPMs, , , most, [
     case $host in
       *-solaris2*)
         case `uname -r` in
@@ -72,7 +72,7 @@ For more info: <http://issues.apache.org/bugzilla/show_bug.cgi?id=34264>])
   ])
     APACHE_MODULE(cgi, CGI scripts.  Enabled by default with non-threaded MPMs, , , no)
 else
-    APACHE_MODULE(cgi, CGI scripts.  Enabled by default with non-threaded MPMs, , , yes)
+    APACHE_MODULE(cgi, CGI scripts.  Enabled by default with non-threaded MPMs, , , most)
     APACHE_MODULE(cgid, CGI scripts.  Enabled by default with threaded MPMs, , , no)
 fi
 

diff --git a/modules/mappers/config9.m4 b/modules/mappers/config9.m4
index 0564daad1e1f136546841afeb325c4e11fdeb038..55a97ab9932f0959e4847966026eb0aeec31bc2f 100644 (file)
--- a/modules/mappers/config9.m4
+++ b/modules/mappers/config9.m4
@@ -5,12 +5,12 @@ dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
 APACHE_MODPATH_INIT(mappers)
 
 APACHE_MODULE(vhost_alias, mass virtual hosting module, , , most)
-APACHE_MODULE(negotiation, content negotiation, , , yes)
+APACHE_MODULE(negotiation, content negotiation, , , most)
 APACHE_MODULE(dir, directory request handling, , , yes)
 APACHE_MODULE(imagemap, server-side imagemaps, , , no)
-APACHE_MODULE(actions, Action triggering on requests, , , yes)
+APACHE_MODULE(actions, Action triggering on requests, , , most)
 APACHE_MODULE(speling, correct common URL misspellings, , , most)
-APACHE_MODULE(userdir, mapping of requests to user-specific directories, , , yes)
+APACHE_MODULE(userdir, mapping of requests to user-specific directories, , , most)
 APACHE_MODULE(alias, mapping of requests to different filesystem parts, , , yes)
 APACHE_MODULE(rewrite, rule based URL manipulation, , , most)
 

diff --git a/modules/metadata/config.m4 b/modules/metadata/config.m4
index 66caf81464c2b88b285501388213cb7617faa275..25d1aece65ffd1bd063dbba66f1cce6be63d15aa 100644 (file)
--- a/modules/metadata/config.m4
+++ b/modules/metadata/config.m4
@@ -8,7 +8,7 @@ APACHE_MODULE(env, clearing/setting of ENV vars, , , yes)
 APACHE_MODULE(mime_magic, automagically determining MIME type)
 APACHE_MODULE(cern_meta, CERN-type meta files, , , no)
 APACHE_MODULE(expires, Expires header control, , , most)
-APACHE_MODULE(headers, HTTP header control, , , most)
+APACHE_MODULE(headers, HTTP header control, , , yes)
 APACHE_MODULE(ident, RFC 1413 identity check, , , no)
 
 APACHE_MODULE(usertrack, user-session tracking, , , , [