[PATCH v6 1/7] t/lib-httpd: load mod_unixd
- From
Jacob Keller <jacob.e.keller@intel.com>
- Date
- Feb 29, 2016, 22:58 UTC
- Message-ID
- <1456786715-24256-2-git-send-email-jacob.e.keller@intel.com>
- In-Reply-To
- <1456786715-24256-1-git-send-email-jacob.e.keller@intel.com>
From: Michael J Gruber <git@drmicha.warpmail.net>
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> ---
I am sending this as an indicator that we need to queue my submodule work on top of this, because at least locally on my Fedora 23 system I an unable to get the httpd tests to pass otherwise.
t/lib-httpd/apache.conf | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf index 7d15e6d44c83..f667e7ce2f33 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
-- 2.7.1.429.g45cd78e