Mark RadaSome people have mod_cgid instead of mod_cgi, most likely as a result of choosing a threaded MPM.
In cases where the user has both modules, mod_cgi will be preferred in order to maintain a simpler setup.
This patch also causes instaweb to print a message and die in cases where there is no module that instaweb knows how to handle.
Signed-off-by: Mark Rada <marada@uwaterloo.ca> ---
I thought I would squeeze this patch in while I was at it today.
git-instaweb.sh | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-)
Show changes to git-instaweb.sh +15 −1
diff --git a/git-instaweb.sh b/git-instaweb.sh index d96eddb..622a5f0 100755 --- a/git-instaweb.sh +++ b/git-instaweb.sh @@ -317,7 +317,21 @@ EOF resolve_full_httpd list_mods=$(echo "$full_httpd" | sed "s/-f$/-l/") $list_mods | grep 'mod_cgi\.c' >/dev/null 2>&1 || \ - echo "LoadModule cgi_module $module_path/mod_cgi.so" >> "$conf" + if test -f "$module_path/mod_cgi.so" + then + echo "LoadModule cgi_module $module_path/mod_cgi.so" >> "$conf" + else + $list_mods | grep 'mod_cgid\.c' >/dev/null 2>&1 || \ + if test -f "$module_path/mod_cgid.so" + then + echo "LoadModule cgid_module $module_path/mod_cgid.so" \ + >> "$conf" + else + echo "You have no CGI support!" + exit 2 + fi + echo "ScriptSock logs/gitweb.sock" >> "$conf" + fi cat >> "$conf" <<EOF AddHandler cgi-script .cgi <Location /gitweb.cgi>
-- 1.6.4.GIT