Merge branch 'jn/gitweb-return-or-exit-cleanup'

* jn/gitweb-return-or-exit-cleanup: gitweb: Return or exit after done serving request Conflicts: gitweb/gitweb.perl
git-mirror · Jun 22, 2010 · 5bfd536 · 5bfd536
2 parents 3919d40 + 5ed2ec1
commit 5bfd536
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
@@ -1109,6 +1109,15 @@ sub run {
 
 run();
 
+if (defined caller) {
+	# wrapped in a subroutine processing requests,
+	# e.g. mod_perl with ModPerl::Registry, or PSGI with Plack::App::WrapCGI
+	return;
+} else {
+	# pure CGI script, serving single request
+	exit;
+}
+
 ## ======================================================================
 ## action links