Skip to content

Commit f8ee1f0

Browse files
jmccrohangitster
authored andcommitted
git-instaweb: add support for Apache 2.4
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 4a28f16 commit f8ee1f0

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

git-instaweb.sh

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,17 @@ PidFile "$fqgitdir/pid"
345345
Listen $bind$port
346346
EOF
347347

348-
for mod in mime dir env log_config
348+
for mod in mpm_event mpm_prefork mpm_worker
349+
do
350+
if test -e $module_path/mod_${mod}.so
351+
then
352+
echo "LoadModule ${mod}_module " \
353+
"$module_path/mod_${mod}.so" >> "$conf"
354+
# only one mpm module permitted
355+
break
356+
fi
357+
done
358+
for mod in mime dir env log_config authz_core
349359
do
350360
if test -e $module_path/mod_${mod}.so
351361
then

0 commit comments

Comments
 (0)