Skip to content

Commit

Permalink
t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jeff King authored and Junio C Hamano committed Jun 14, 2013
1 parent b3b8ceb commit 0442743
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions t/lib-httpd/apache.conf
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 0442743

Please sign in to comment.