git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] git-instaweb: fix mod_perl detection for apache2
@ 2009-08-08 22:24 Mark A Rada
  2009-08-10  1:38 ` Junio C Hamano
  0 siblings, 1 reply; 5+ messages in thread
From: Mark A Rada @ 2009-08-08 22:24 UTC (permalink / raw)
  To: git

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>
---
  git-instaweb.sh |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/git-instaweb.sh b/git-instaweb.sh
index 32f6496..5f5cac7 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
-- 
1.6.4

^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2009-08-18  7:38 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-08-08 22:24 [PATCH] git-instaweb: fix mod_perl detection for apache2 Mark A Rada
2009-08-10  1:38 ` Junio C Hamano
2009-08-10  8:55   ` Jakub Narebski
2009-08-15 16:09     ` Mark A Rada
2009-08-18  7:45       ` Jakub Narebski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).