From: Jeff King <peff@peff.net>
Date: Sun, 9 Jun 2013 08:07:59 +0000 (-0400)
Subject: t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4
X-Git-Tag: v1.8.3.4~27^2~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0442743810c6f6c14386a5a9d6bf8e4d69adbc51

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>
---

diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index 542241b229..891edd716c 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