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://git.lorimer.id.au/gitweb.git/diff_plain/211e76d48b86f9b3e38c9c9f62d104723dea1964?ds=inline;hp=-c

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
diff --combined t/lib-httpd/apache.conf
index b5bce459b6,0f6f9abbb1..dd17e3a09d
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@@ -1,5 -1,4 +1,4 @@@
  ServerName dummy
- LockFile accept.lock
  PidFile httpd.pid
  DocumentRoot www
  LogFormat "%h %l %u %t \"%r\" %>s %b" common
@@@ -24,6 -23,10 +23,10 @@@ ErrorLog error.lo
  	LoadModule version_module modules/mod_version.so
  </IfModule>
  
+ <IfVersion < 2.4>
+ LockFile accept.lock
+ </IfVersion>
+ 
  <IfVersion < 2.1>
  <IfModule !mod_auth.c>
  	LoadModule auth_module modules/mod_auth.so
@@@ -45,6 -48,21 +48,21 @@@
  </IfModule>
  </IfVersion>
  
+ <IfVersion >= 2.4>
+ <IfModule !mod_authn_core.c>
+ 	LoadModule authn_core_module modules/mod_authn_core.so
+ </IfModule>
+ <IfModule !mod_authz_core.c>
+ 	LoadModule authz_core_module modules/mod_authz_core.so
+ </IfModule>
+ <IfModule !mod_access_compat.c>
+ 	LoadModule access_compat_module modules/mod_access_compat.so
+ </IfModule>
+ <IfModule !mod_mpm_prefork.c>
+ 	LoadModule mpm_prefork_module modules/mod_mpm_prefork.so
+ </IfModule>
+ </IfVersion>
+ 
  PassEnv GIT_VALGRIND
  PassEnv GIT_VALGRIND_OPTIONS
  
@@@ -64,11 -82,6 +82,11 @@@ Alias /auth/dumb/ www/auth/dumb
  	SetEnv GIT_COMMITTER_NAME "Custom User"
  	SetEnv GIT_COMMITTER_EMAIL custom@example.com
  </LocationMatch>
 +<LocationMatch /smart_namespace/>
 +	SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH}
 +	SetEnv GIT_HTTP_EXPORT_ALL
 +	SetEnv GIT_NAMESPACE ns
 +</LocationMatch>
  ScriptAliasMatch /smart_*[^/]*/(.*) ${GIT_EXEC_PATH}/git-http-backend/$1
  ScriptAlias /broken_smart/ broken-smart-http.sh/
  <Directory ${GIT_EXEC_PATH}>