Skip to content

Commit f0e588d

Browse files
ferrous26gitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 5dc36a5 commit f0e588d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

git-instaweb.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ EOF
278278

279279
# check to see if Dennis Stosberg's mod_perl compatibility patch
280280
# (<[email protected]>) has been applied
281-
if test -f "$module_path/mod_perl.so" && grep '^our $gitbin' \
281+
if test -f "$module_path/mod_perl.so" && grep 'MOD_PERL' \
282282
"$GIT_DIR/gitweb/gitweb.cgi" >/dev/null
283283
then
284284
# favor mod_perl if available

0 commit comments

Comments
 (0)