From: Rainer Jung <rjung@apache.org>
Date: Tue, 8 Nov 2011 21:25:28 +0000 (+0000)
Subject: Load all modules in the generated default configuration
X-Git-Tag: 2.3.15~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc2ea4121cb27e1d5171dbf90eb15cd0f8314f30;p=thirdparty%2Fapache%2Fhttpd.git

Load all modules in the generated default configuration
when using --enable-load-all-modules with configure.


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

diff --git a/CHANGES b/CHANGES
index 559c2021d04..40639897463 100644
--- a/CHANGES
+++ b/CHANGES
@@ -16,6 +16,9 @@ Changes with Apache 2.3.15
      core: Fix integer overflow in ap_pregsub. This can be triggered e.g.
      with mod_setenvif via a malicious .htaccess. [Stefan Fritsch]
 
+  *) configure: Load all modules in the generated default configuration
+     when using --enable-load-all-modules. [Rainer Jung]
+
   *) mod_reqtimeout: Change the default to set some reasonable timeout
      values. [Stefan Fritsch]
 
diff --git a/Makefile.in b/Makefile.in
index ec946659999..6297b27c232 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -61,10 +61,14 @@ install-conf:
 	    			for j in $(DSO_MODULES) "^EOL^"; do \
 	    				if test $$j != "^EOL^"; then \
 	    					if echo "$(ENABLED_DSO_MODULES)"|$(EGREP) "\<$$j\>" > /dev/null ; then \
-	    						echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
+	    						loading_disabled=""; \
 	    					else \
-	    						echo "#LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
+	    						loading_disabled="#"; \
 	    					fi; \
+	    					if test "$(LOAD_ALL_MODULES)" = "yes"; then \
+	    						loading_disabled=""; \
+	    					fi; \
+    						echo "$${loading_disabled}LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
 	    				fi; \
 	    			done; \
 	    			sed -e '1,/@@LoadModule@@/d' \
diff --git a/acinclude.m4 b/acinclude.m4
index 984a21d794f..a07838637b5 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -90,6 +90,7 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
   APACHE_SUBST(INSTALL_PROG_FLAGS)
   APACHE_SUBST(DSO_MODULES)
   APACHE_SUBST(ENABLED_DSO_MODULES)
+  APACHE_SUBST(LOAD_ALL_MODULES)
   APACHE_SUBST(APR_BINDIR)
   APACHE_SUBST(APR_INCLUDEDIR)
   APACHE_SUBST(APR_VERSION)
diff --git a/configure.in b/configure.in
index 45207e72cc5..44270059138 100644
--- a/configure.in
+++ b/configure.in
@@ -730,6 +730,14 @@ if test $v4mapped = "yes" -a $ac_cv_define_APR_HAVE_IPV6 = "yes"; then
               [Allow IPv4 connections on IPv6 listening sockets])
 fi
 
+AC_ARG_ENABLE(load-all-modules,APACHE_HELP_STRING(--enable-load-all-modules,Load all modules),
+[ 
+  LOAD_ALL_MODULES=$enableval
+],
+[
+  LOAD_ALL_MODULES="no"
+])
+
 APACHE_FAST_OUTPUT(Makefile modules/Makefile srclib/Makefile) 
 APACHE_FAST_OUTPUT(os/Makefile server/Makefile)
 APACHE_FAST_OUTPUT(support/Makefile)