git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan McCrohan <jmccrohan@gmail.com>
To: gitster@pobox.com, git@vger.kernel.org
Cc: Jonathan McCrohan <jmccrohan@gmail.com>
Subject: [PATCH] git-instaweb: add support for Apache 2.4
Date: Tue, 27 May 2014 02:18:10 +0100	[thread overview]
Message-ID: <1401153490-6567-1-git-send-email-jmccrohan@gmail.com> (raw)

Detect available Apache MPMs and use first available according to
following order of precedence:
mpm_event
mpm_prefork
mpm_worker

Add authz_core module if available to avoid HTTP Error 500 errors.

Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com>
---
 git-instaweb.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/git-instaweb.sh b/git-instaweb.sh
index 4aa3eb8..513efa6 100755
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -345,7 +345,17 @@ PidFile "$fqgitdir/pid"
 Listen $bind$port
 EOF
 
-	for mod in mime dir env log_config
+	for mod in mpm_event mpm_prefork mpm_worker
+	do
+		if test -e $module_path/mod_${mod}.so
+		then
+			echo "LoadModule ${mod}_module " \
+			     "$module_path/mod_${mod}.so" >> "$conf"
+			# only one mpm module permitted
+			break
+		fi
+	done
+	for mod in mime dir env log_config authz_core
 	do
 		if test -e $module_path/mod_${mod}.so
 		then
-- 
2.0.0.rc2

                 reply	other threads:[~2014-05-27  1:35 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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

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

  git send-email \
    --in-reply-to=1401153490-6567-1-git-send-email-jmccrohan@gmail.com \
    --to=jmccrohan@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /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.
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 NNTP newsgroup(s).