[PATCH 1/4] t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4

From: Jeff King <peff@peff.net>
Date: Jun 9, 2013, 08:07 UTC
Message-ID: <20130609080759.GA32139@sigill.intra.peff.net>
In-Reply-To: <20130609080722.GA31699@sigill.intra.peff.net>

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>
---
 t/lib-httpd/apache.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index b5bce45..38699bb 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -1,5 +1,7 @@ LockFile accept.lock
 ServerName dummy
+<IfVersion < 2.4>
 LockFile accept.lock
+</IfVersion>
 PidFile httpd.pid
 DocumentRoot www
 LogFormat "%h %l %u %t \"%r\" %>s %b" common

-- 
1.8.3.rc2.14.g7eee6b3