diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-03-04 13:45:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-04 13:45:42 -0800 |
| commit | bc0ffd41b92c8539fc7dbe27f256d8bae6b28d05 (patch) | |
| tree | 266a5526e9a251bc9aa6489019ab76767d7e5a97 | |
| parent | 2e7b6afcba4993a1a424725afaa508b2641fb416 (diff) | |
| parent | 59223223f478b291c6dbe59ca0bca3c6178da7a0 (diff) | |
| download | git-bc0ffd41b92c8539fc7dbe27f256d8bae6b28d05.tar.gz | |
Merge branch 'mg/httpd-tests-update-for-apache-2.4'
The way the test scripts configure the Apache web server has been
updated to work also for Apache 2.4 running on RedHat derived
distros.
* mg/httpd-tests-update-for-apache-2.4:
t/lib-httpd: load mod_unixd
| -rw-r--r-- | t/lib-httpd/apache.conf | 3 |
1 files changed, 3 insertions, 0 deletions
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 |