t/lib-httpd: load mod_unixd
authorMichael J Gruber <git@drmicha.warpmail.net>
Mon, 11 May 2015 11:54:17 +0000 (13:54 +0200)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Feb 2016 23:25:16 +0000 (15:25 -0800)
In contrast to apache 2.2, apache 2.4 does not load mod_unixd in its
default configuration (because there are choices). Thus, with the
current config, apache 2.4.10 will not be started and the httpd tests
will not run on distros with default apache config (RedHat type).

Enable mod_unixd to make the httpd tests run. This does not affect
distros negatively which have that config already in their default
(Debian type). httpd tests will run on these before and after this patch.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/lib-httpd/apache.conf
index 7d15e6d44c83f6b37297ae01a2998825e313b9b2..f667e7ce2f33dba0c10764f2f62101685d74cf3d 100644 (file)
@@ -64,6 +64,9 @@ LockFile accept.lock
 <IfModule !mod_mpm_prefork.c>
        LoadModule mpm_prefork_module modules/mod_mpm_prefork.so
 </IfModule>
 <IfModule !mod_mpm_prefork.c>
        LoadModule mpm_prefork_module modules/mod_mpm_prefork.so
 </IfModule>
+<IfModule !mod_unixd.c>
+       LoadModule unixd_module modules/mod_unixd.so
+</IfModule>
 </IfVersion>
 
 PassEnv GIT_VALGRIND
 </IfVersion>
 
 PassEnv GIT_VALGRIND