diff options
| author |  Mark A Rada <marada@uwaterloo.ca> | 2009-08-08 18:24:02 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-08-09 18:38:47 -0700 |
| commit | f0e588dffc1a592ec7879cdb610654937cbbe25e (patch) | |
| tree | bf25b11ba38864a3216dca202e99df006c99affa | |
| parent | Merge branch 'maint-1.6.3' into maint (diff) | |
| download | tgif-f0e588dffc1a592ec7879cdb610654937cbbe25e.tar.xz | |
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>
| -rwxr-xr-x | git-instaweb.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-instaweb.sh b/git-instaweb.sh index 32f6496b0d..5f5cac75ea 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 |