summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Jakub Narebski <jnareb@gmail.com>2010-04-24 15:56:13 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-05-01 12:09:51 -0700
commitc42b00c8f2b8c04ff9829e88dcde92d7294cd460 (patch)
tree73f325b8035901ae2d1df688672209048a4a4257
parentgitweb: href(..., -path_info => 0|1) (diff)
downloadtgif-c42b00c8f2b8c04ff9829e88dcde92d7294cd460.tar.xz
gitweb: Use nonlocal jump instead of 'exit' in die_error
Use 'goto DONE' in place of 'exit' to end request processing in die_error() subroutine. While at it, do not end gitweb with 'exit'. This would make it easier in the future to add support or improve support for persistent environments such as FastCGI and mod_perl. It would also make it easier to make use of die_error() as an error handler (for fatalsToBrowser). Perl 5 allows non-local jumps; the restriction is that you cannot jump into a scope. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Acked-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgitweb/gitweb.perl5
1 files changed, 3 insertions, 2 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 6cefb09b45..ed92dcac08 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -972,7 +972,8 @@ if ($action !~ m/^(?:opml|project_list|project_index)$/ &&
die_error(400, "Project needed");
}
$actions{$action}->();
-exit;
+DONE_GITWEB:
+1;
## ======================================================================
## action links
@@ -3432,7 +3433,7 @@ EOF
print "</div>\n";
git_footer_html();
- exit;
+ goto DONE_GITWEB;
}
## ----------------------------------------------------------------------