From 0442743810c6f6c14386a5a9d6bf8e4d69adbc51 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Sun, 9 Jun 2013 04:07:59 -0400 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- 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 542241b229..891edd716c 100644 --- a/t/lib-httpd/apache.conf +++ b/t/lib-httpd/apache.conf @@ -1,5 +1,7 @@ ServerName dummy + LockFile accept.lock + PidFile httpd.pid DocumentRoot www LogFormat "%h %l %u %t \"%r\" %>s %b" common -- 2.43.2