summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan McCrohan <jmccrohan@gmail.com>2014-05-27 02:18:10 +0100
committerJunio C Hamano <gitster@pobox.com>2014-05-27 12:57:19 -0700
commitf8ee1f02da6182a3242306a52c5ae7a39547b37e (patch)
treeeeaa999766a44c3f3a8be7d5a31210064c17db08
parent4a28f169ad29ba452e0e7bea2583914c10c58322 (diff)
downloadgit-f8ee1f02da6182a3242306a52c5ae7a39547b37e.tar.gz
git-instaweb: add support for Apache 2.4jm/instaweb-apache-24
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-instaweb.sh12
1 files changed, 11 insertions, 1 deletions
diff --git a/git-instaweb.sh b/git-instaweb.sh
index 4aa3eb80fd..513efa662e 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