From: Michael J Gruber <git@drmicha.warpmail.net>
Date: Mon, 11 May 2015 11:54:17 +0000 (+0200)
Subject: t/lib-httpd: load mod_unixd
X-Git-Tag: v2.8.0-rc1~8^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/59223223f478b291c6dbe59ca0bca3c6178da7a0?ds=inline;hp=--cc

t/lib-httpd: load mod_unixd

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>
---

59223223f478b291c6dbe59ca0bca3c6178da7a0
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index 7d15e6d44c..f667e7ce2f 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -64,6 +64,9 @@ LockFile accept.lock
 <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