Code

git-instaweb: some Apache have mod_cgi builtin
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Wed, 26 Jul 2006 14:33:18 +0000 (16:33 +0200)
committerJunio C Hamano <junkio@cox.net>
Wed, 26 Jul 2006 19:24:15 +0000 (12:24 -0700)
So test for it, and do not always try to load mod_cgi.o.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-instaweb.sh

index 63b18b99f65fe7ac60a76a0dfd2662d7400696c8..9829c591543b0fe4dd55b996cb399d925dda08ab 100755 (executable)
@@ -183,8 +183,10 @@ PerlPassEnv GIT_EXEC_DIR
 EOF
        else
                # plain-old CGI
+               list_mods=`echo "$httpd" | sed "s/-f$/-l/"`
+               $list_mods | grep 'mod_cgi\.c' >/dev/null || \
+               echo "LoadModule cgi_module $module_path/mod_cgi.so" >> "$conf"
                cat >> "$conf" <<EOF
-LoadModule cgi_module $module_path/mod_cgi.so
 AddHandler cgi-script .cgi
 <Location /gitweb.cgi>
        Options +ExecCGI