summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael J Gruber <git@drmicha.warpmail.net>2015-05-11 11:54:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-02-25 23:25:16 (GMT)
commit59223223f478b291c6dbe59ca0bca3c6178da7a0 (patch)
tree270547f65af011d6134fb571fcfe4198622d823b
parent56f37fda511e1615dc6df86c68f3b841711a7828 (diff)
downloadgit-59223223f478b291c6dbe59ca0bca3c6178da7a0.zip
git-59223223f478b291c6dbe59ca0bca3c6178da7a0.tar.gz
git-59223223f478b291c6dbe59ca0bca3c6178da7a0.tar.bz2
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>
-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 7d15e6d..f667e7c 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