summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2013-06-09 08:09:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-14 17:29:04 (GMT)
commit296f0b3ea9b904982780522215a9c71d4a7bd02c (patch)
tree3d7e5957eb10a59ff928e2a7bf596f032d34e6b4
parentbb3f7ccadb5270e060cfbbb44f9c80a8c65cc449 (diff)
downloadgit-296f0b3ea9b904982780522215a9c71d4a7bd02c.zip
git-296f0b3ea9b904982780522215a9c71d4a7bd02c.tar.gz
git-296f0b3ea9b904982780522215a9c71d4a7bd02c.tar.bz2
t/lib-httpd/apache.conf: configure an MPM module for apache 2.4
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--t/lib-httpd/apache.conf3
1 files changed, 3 insertions, 0 deletions
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index eb44322..67b6db1 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