From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Wed, 26 Jul 2006 14:33:18 +0000 (+0200)
Subject: git-instaweb: some Apache have mod_cgi builtin
X-Git-Tag: v1.4.2-rc3~60
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2b5d2d8792c861913d48bcfe02d8a6049c3911f5;p=git.git

git-instaweb: some Apache have mod_cgi builtin

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>
---

diff --git a/git-instaweb.sh b/git-instaweb.sh
index 63b18b99f..9829c5915 100755
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -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