summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5dc36a5)
raw | patch | inline | side by side (parent: 5dc36a5)
author | Mark A Rada <marada@uwaterloo.ca> | |
Sat, 8 Aug 2009 22:24:02 +0000 (18:24 -0400) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 10 Aug 2009 01:38:47 +0000 (18:38 -0700) |
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>
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>
git-instaweb.sh | patch | blob | history |
diff --git a/git-instaweb.sh b/git-instaweb.sh
index 32f6496b0d36cff061f00a4ad70b6fa4d34c2646..5f5cac75eaa6fbf2ca68cfa01de2b21afa352cd0 100755 (executable)
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
# 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