From: Mark A Rada <marada@uwaterloo.ca>
Date: Sat, 8 Aug 2009 22:24:02 +0000 (-0400)
Subject: git-instaweb: fix mod_perl detection for apache2
X-Git-Tag: v1.6.4.1~14
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f0e588dffc1a592ec7879cdb610654937cbbe25e;p=git.git

git-instaweb: fix mod_perl detection for apache2

The script was looking for something that matched the '^our $gitbin'
regex, which no longer exists in gitweb.cgi.

Now it looks for 'MOD_PERL', which should be on the line that checks
to see if the script is running in a mod_perl environment.

Signed-off-by: Mark Rada <marada@uwaterloo.ca>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-instaweb.sh b/git-instaweb.sh
index 32f6496b0..5f5cac75e 100755
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -278,7 +278,7 @@ EOF
 
 	# check to see if Dennis Stosberg's mod_perl compatibility patch
 	# (<20060621130708.Gcbc6e5c@leonov.stosberg.net>) has been applied
-	if test -f "$module_path/mod_perl.so" && grep '^our $gitbin' \
+	if test -f "$module_path/mod_perl.so" && grep 'MOD_PERL' \
 				"$GIT_DIR/gitweb/gitweb.cgi" >/dev/null
 	then
 		# favor mod_perl if available