summaryrefslogtreecommitdiff
path: root/t/lib-httpd
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2013-06-09 08:07:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-14 17:27:54 (GMT)
commit0442743810c6f6c14386a5a9d6bf8e4d69adbc51 (patch)
treeca22eb4fec88795361d0c72475577ecd8eb7feb8 /t/lib-httpd
parentb3b8ceb48b7d75631a8638f1dc6ccdf7f1b53888 (diff)
downloadgit-0442743810c6f6c14386a5a9d6bf8e4d69adbc51.zip
git-0442743810c6f6c14386a5a9d6bf8e4d69adbc51.tar.gz
git-0442743810c6f6c14386a5a9d6bf8e4d69adbc51.tar.bz2
t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4
The LockFile directive from earlier versions of apache has been replaced by the Mutex directive. The latter seems to give sane defaults and does not need any specific customization, so we can get away with just adding a version check to the use of LockFile. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/lib-httpd')
-rw-r--r--t/lib-httpd/apache.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index 542241b..891edd7 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -1,5 +1,7 @@
ServerName dummy
+<IfVersion < 2.4>
LockFile accept.lock
+</IfVersion>
PidFile httpd.pid
DocumentRoot www
LogFormat "%h %l %u %t \"%r\" %>s %b" common