git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Subject: [PATCH 2/4] t/lib-httpd/apache.conf: load extra auth modules in apache 2.4
Date: Sun, 9 Jun 2013 04:08:22 -0400	[thread overview]
Message-ID: <20130609080822.GB32139@sigill.intra.peff.net> (raw)
In-Reply-To: <20130609080722.GA31699@sigill.intra.peff.net>

In apache 2.4, the "Auth*" and "Require" directives have
moved into the authn_core and authz_core modules,
respectively.

Signed-off-by: Jeff King <peff@peff.net>
---
 t/lib-httpd/apache.conf | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index 38699bb..1d3615b 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -47,6 +47,15 @@ ErrorLog error.log
 </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>
+</IfVersion>
+
 PassEnv GIT_VALGRIND
 PassEnv GIT_VALGRIND_OPTIONS
 
-- 
1.8.3.rc2.14.g7eee6b3

  parent reply	other threads:[~2013-06-09  8:08 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-09  8:07 [RFH/PATCH 0/4] git http tests with apache 2.4 Jeff King
2013-06-09  8:07 ` [PATCH 1/4] t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4 Jeff King
2013-06-09  8:08 ` Jeff King [this message]
2013-06-09  8:08 ` [PATCH 3/4] t/lib-httpd/apache.conf: load compat access module in apache 2.4 Jeff King
2013-06-09  8:09 ` [PATCH 4/4] t/lib-httpd/apache.conf: configure an MPM module for " Jeff King
2013-06-14 17:32 ` [RFH/PATCH 0/4] git http tests with " Junio C Hamano
2013-06-14 21:58   ` Jeff King

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130609080822.GB32139@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).