Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'mg/httpd-tests-update-for-apache-2.4'
author
Junio C Hamano
<gitster@pobox.com>
Fri, 4 Mar 2016 21:45:42 +0000
(13:45 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 4 Mar 2016 21:45:42 +0000
(13:45 -0800)
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
t/lib-httpd/apache.conf
patch
|
blob
|
history
raw
(from parent 1:
2e7b6af
)
diff --git
a/t/lib-httpd/apache.conf
b/t/lib-httpd/apache.conf
index 7d15e6d44c83f6b37297ae01a2998825e313b9b2..f667e7ce2f33dba0c10764f2f62101685d74cf3d 100644
(file)
--- 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