diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-06-16 12:18:06 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-06-16 12:18:06 -0700 |
commit | bf2941be5daa278a4e866e820fc499e57d50714f (patch) | |
tree | c3bfebbf4417919047e7b00f55256e01c04c7275 | |
parent | 474df928b11975d8c0ef532a3b61e1b86143406a (diff) | |
parent | f8ee1f02da6182a3242306a52c5ae7a39547b37e (diff) | |
download | git-bf2941be5daa278a4e866e820fc499e57d50714f.tar.gz git-bf2941be5daa278a4e866e820fc499e57d50714f.tar.xz |
Merge branch 'jm/instaweb-apache-24'
* jm/instaweb-apache-24:
git-instaweb: add support for Apache 2.4
-rwxr-xr-x | git-instaweb.sh | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/git-instaweb.sh b/git-instaweb.sh index 4aa3eb80f..513efa662 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 |