[PATCH 4/4] t/lib-httpd/apache.conf: configure an MPM module for apache 2.4
- From
Jeff King <peff@peff.net>
- Date
- Jun 9, 2013, 08:09 UTC
- Message-ID
- <20130609080932.GD32139@sigill.intra.peff.net>
- In-Reply-To
- <20130609080722.GA31699@sigill.intra.peff.net>
Versions of Apache before 2.4 always had a "MultiProcessing Module" (MPM) statically built in, which manages the worker threads/processes. We do not care which one, as it is largely a performance issue, and we put only a light load on the server during our testing.
As of Apache 2.4, the MPM module is loadable just like any other module, but exactly one such module must be loaded. On a system where the MPMs are compiled dynamically (e.g., Debian unstable), this means that our test Apache server will not start unless we provide the appropriate configuration.
Unfortunately, we do not actually know which MPM modules are available or appropriate for the system on which the tests are running. This patch picks the "prefork" module, as it is likely to be available on all Unix-like systems.
Signed-off-by: Jeff King <peff@peff.net> --- t/lib-httpd/apache.conf | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf index 4883b8c..56ae548 100644 --- a/t/lib-httpd/apache.conf +++ b/t/lib-httpd/apache.conf @@ -57,6 +57,9 @@ ErrorLog error.log <IfModule !mod_access_compat.c> LoadModule access_compat_module modules/mod_access_compat.so </IfModule> +<IfModule !mod_mpm_prefork.c> + LoadModule mpm_prefork_module modules/mod_mpm_prefork.so +</IfModule> </IfVersion> PassEnv GIT_VALGRIND
-- 1.8.3.rc2.14.g7eee6b3