gitweb: Use nonlocal jump instead of 'exit' in die_error
authorJakub Narebski <jnareb@gmail.com>
Sat, 24 Apr 2010 13:56:13 +0000 (15:56 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sat, 1 May 2010 19:09:51 +0000 (12:09 -0700)
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>
gitweb/gitweb.perl
index 6cefb09b45e12ff2726321fd4b913d7d8ac79845..ed92dcac083d6644998ef68810409624abbbb417 100755 (executable)
@@ -972,7 +972,8 @@ sub evaluate_path_info {
        die_error(400, "Project needed");
 }
 $actions{$action}->();
-exit;
+DONE_GITWEB:
+1;
 
 ## ======================================================================
 ## action links
@@ -3432,7 +3433,7 @@ sub die_error {
        print "</div>\n";
 
        git_footer_html();
-       exit;
+       goto DONE_GITWEB;
 }
 
 ## ----------------------------------------------------------------------