Skip to content
This repository was archived by the owner on Nov 9, 2017. It is now read-only.

Commit 296f0b3

Browse files
peffgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent bb3f7cc commit 296f0b3

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

t/lib-httpd/apache.conf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@ ErrorLog error.log
5757
<IfModule !mod_access_compat.c>
5858
LoadModule access_compat_module modules/mod_access_compat.so
5959
</IfModule>
60+
<IfModule !mod_mpm_prefork.c>
61+
LoadModule mpm_prefork_module modules/mod_mpm_prefork.so
62+
</IfModule>
6063
</IfVersion>
6164

6265
PassEnv GIT_VALGRIND

0 commit comments

Comments
 (0)