From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Jul 2013 17:41:01 +0000 (-0700)
Subject: Merge branch 'jk/apache-test-for-2.4' into maint
X-Git-Tag: v1.8.3.4~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=211e76d48b86f9b3e38c9c9f62d104723dea1964;p=git

Merge branch 'jk/apache-test-for-2.4' into maint

Allow our tests to run with newer Apache.

* jk/apache-test-for-2.4:
  lib-httpd/apache.conf: check version only after mod_version loads
  t/lib-httpd/apache.conf: configure an MPM module for apache 2.4
  t/lib-httpd/apache.conf: load compat access module in apache 2.4
  t/lib-httpd/apache.conf: load extra auth modules in apache 2.4
  t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4
---

211e76d48b86f9b3e38c9c9f62d104723dea1964