diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-07-22 17:25:24 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-22 17:25:24 (GMT) |
| commit | af3e5d1b2af6322621f26791abf8d619771f04e2 (patch) | |
| tree | 9530bce05e091cc9ef7b563b2593bc0b4f4606bb | |
| parent | cfececfe1ff1554783030a6f08b431ad50263800 (diff) | |
| parent | f8ee1f02da6182a3242306a52c5ae7a39547b37e (diff) | |
| download | git-af3e5d1b2af6322621f26791abf8d619771f04e2.zip git-af3e5d1b2af6322621f26791abf8d619771f04e2.tar.gz git-af3e5d1b2af6322621f26791abf8d619771f04e2.tar.bz2 | |
Merge branch 'jm/instaweb-apache-24' into maint
* 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 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 |