Skip to content

Commit 20e7ab8

Browse files
jnarebgitster
authored andcommitted
git-instaweb: Change how gitweb.psgi is made runnable as standalone app
According to blog post "FindBin, __FILE__, $0 and PSGI woes" http://bulknews.typepad.com/blog/2011/02/findbin-__file__-0-and-psgi-woes.html by Tatsuhiko Miyagawa, using 'if (__FILE__ eq $0)' in .psgi code (to check if script was run from command line), is not supposed to work since Plack 0.9971. Replace it with one of proposed solutions; while at it return $app explicitely, rather than implicitely by being a last expression. This affects 'plackup' web server. While at it cleanup whitespace. Signed-off-by: Jakub Narebski <[email protected]> Acked-by: Eric Wong <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 62270f6 commit 20e7ab8

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

git-instaweb.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -558,12 +558,14 @@ my \$app = builder {
558558
559559
# make it runnable as standalone app,
560560
# like it would be run via 'plackup' utility
561-
if (__FILE__ eq \$0) {
561+
if (caller) {
562+
return \$app;
563+
} else {
562564
require Plack::Runner;
563565
564566
my \$runner = Plack::Runner->new();
565567
\$runner->parse_options(qw(--env deployment --port $port),
566-
"$local" ? qw(--host 127.0.0.1) : ());
568+
"$local" ? qw(--host 127.0.0.1) : ());
567569
\$runner->run(\$app);
568570
}
569571
__END__

0 commit comments

Comments
 (0)