Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-instaweb: add support for Apache 2.4
author
Jonathan McCrohan
<jmccrohan@gmail.com>
Tue, 27 May 2014 01:18:10 +0000
(
02:18
+0100)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 27 May 2014 19:57:19 +0000
(12:57 -0700)
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>
git-instaweb.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
4a28f16
)
diff --git
a/git-instaweb.sh
b/git-instaweb.sh
index 4aa3eb80fd25a803d291631965d009a49cfe79dc..513efa662e86cb157b8690bfb025556fa0c836f0 100755
(executable)
--- 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