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 2011/11/08 22:25:28 UTC
svn commit: r1199467 - in /httpd/httpd/trunk: CHANGES Makefile.in
acinclude.m4 configure.in
Author: rjung
Date: Tue Nov 8 21:25:28 2011
New Revision: 1199467
URL: http://svn.apache.org/viewvc?rev=1199467&view=rev
Log:
Load all modules in the generated default configuration
when using --enable-load-all-modules with configure.
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/Makefile.in
httpd/httpd/trunk/acinclude.m4
httpd/httpd/trunk/configure.in
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1199467&r1=1199466&r2=1199467&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Tue Nov 8 21:25:28 2011
@@ -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]
Modified: httpd/httpd/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Makefile.in?rev=1199467&r1=1199466&r2=1199467&view=diff
==============================================================================
--- httpd/httpd/trunk/Makefile.in (original)
+++ httpd/httpd/trunk/Makefile.in Tue Nov 8 21:25:28 2011
@@ -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' \
Modified: httpd/httpd/trunk/acinclude.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/acinclude.m4?rev=1199467&r1=1199466&r2=1199467&view=diff
==============================================================================
--- httpd/httpd/trunk/acinclude.m4 (original)
+++ httpd/httpd/trunk/acinclude.m4 Tue Nov 8 21:25:28 2011
@@ -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)
Modified: httpd/httpd/trunk/configure.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/configure.in?rev=1199467&r1=1199466&r2=1199467&view=diff
==============================================================================
--- httpd/httpd/trunk/configure.in (original)
+++ httpd/httpd/trunk/configure.in Tue Nov 8 21:25:28 2011
@@ -730,6 +730,14 @@ if test $v4mapped = "yes" -a $ac_cv_defi
[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)