WARNING! GitLab maintenance operation scheduled for this Friday between 14:00 and 19:00 (CET). During this time window, GitLab will be unavailable, and any data entered during this period may be lost. Thank you in advance for your understanding.

Commit f09019ed authored Nov 08, 2011 by Rainer Jung

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

parent fc2043ec

CHANGES

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,9 @@ Changes with Apache 2.3.15
	core: Fix integer overflow in ap_pregsub. This can be triggered e.g.		core: Fix integer overflow in ap_pregsub. This can be triggered e.g.
	with mod_setenvif via a malicious .htaccess. [Stefan Fritsch]		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		*) mod_reqtimeout: Change the default to set some reasonable timeout
	values. [Stefan Fritsch]		values. [Stefan Fritsch]

Makefile.in

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -61,10 +61,14 @@ install-conf:
	for j in $(DSO_MODULES) "^EOL^"; do \		for j in $(DSO_MODULES) "^EOL^"; do \
	if test $$j != "^EOL^"; then \		if test $$j != "^EOL^"; then \
	if echo "$(ENABLED_DSO_MODULES)"\|$(EGREP) "\<$$j\>" > /dev/null ; then \		if echo "$(ENABLED_DSO_MODULES)"\|$(EGREP) "\<$$j\>" > /dev/null ; then \
	echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \		loading_disabled=""; \
	else \		else \
	echo "#LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \		loading_disabled="#"; \
	fi; \		fi; \
			if test "$(LOAD_ALL_MODULES)" = "yes"; then \
			loading_disabled=""; \
			fi; \
			echo "$${loading_disabled}LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
	fi; \		fi; \
	done; \		done; \
	sed -e '1,/@@LoadModule@@/d' \		sed -e '1,/@@LoadModule@@/d' \

acinclude.m4

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -90,6 +90,7 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
	APACHE_SUBST(INSTALL_PROG_FLAGS)		APACHE_SUBST(INSTALL_PROG_FLAGS)
	APACHE_SUBST(DSO_MODULES)		APACHE_SUBST(DSO_MODULES)
	APACHE_SUBST(ENABLED_DSO_MODULES)		APACHE_SUBST(ENABLED_DSO_MODULES)
			APACHE_SUBST(LOAD_ALL_MODULES)
	APACHE_SUBST(APR_BINDIR)		APACHE_SUBST(APR_BINDIR)
	APACHE_SUBST(APR_INCLUDEDIR)		APACHE_SUBST(APR_INCLUDEDIR)
	APACHE_SUBST(APR_VERSION)		APACHE_SUBST(APR_VERSION)

configure.in

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -730,6 +730,14 @@ if test $v4mapped = "yes" -a $ac_cv_define_APR_HAVE_IPV6 = "yes"; then
	[Allow IPv4 connections on IPv6 listening sockets])		[Allow IPv4 connections on IPv6 listening sockets])
	fi		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(Makefile modules/Makefile srclib/Makefile)
	APACHE_FAST_OUTPUT(os/Makefile server/Makefile)		APACHE_FAST_OUTPUT(os/Makefile server/Makefile)
	APACHE_FAST_OUTPUT(support/Makefile)		APACHE_FAST_OUTPUT(support/Makefile)