This adds output buffering for gitweb, mainly in preparation for
caching support. This is a dramatic change to how caching was being
done, mainly in passing around the variable manually and such.
This centrally flips the entire STDOUT to a variable, which after the
completion of the run, flips it back and does a print on the resulting
data.
This should save on the previous 10K line patch (or so) that adds more
explicit output passing.
[jn: modified reset_output to silence 'gitweb.perl: Name "main::STDOUT_REAL"
used only once: possible typo at ../gitweb/gitweb.perl line 1130.' warning]
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
---
gitweb/gitweb.perl | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index cfa511c..cae0e34 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -39,6 +39,9 @@ BEGIN {
our $version = "++GIT_VERSION++";
+# Output buffer variable
+our $output = "";
+
our ($my_url, $my_uri, $base_url, $path_info, $home_link);
sub evaluate_uri {
our $cgi;
@@ -1134,6 +1137,25 @@ sub evaluate_argv {
);
}
+sub change_output {
+ our $output;
+
+ # Trap the 'proper' STDOUT to STDOUT_REAL for things like error messages and such
+ open(STDOUT_REAL,">&STDOUT") or die "Unable to capture STDOUT $!\n";
+
+ # Close STDOUT, so that it isn't being used anymore.
+ close STDOUT;
+
+ # Trap STDOUT to the $output variable, which is what I was using in the original
+ # patch anyway.
+ open(STDOUT,">", \$output) || die "Unable to open STDOUT: $!"; #open STDOUT handle to use $var
+}
+
+sub reset_output {
+ # This basically takes STDOUT_REAL and puts it back as STDOUT
+ open STDOUT, ">&", \*STDOUT_REAL;
+}
+
sub run {
evaluate_argv();
@@ -1145,7 +1167,10 @@ sub run {
$pre_dispatch_hook->()
if $pre_dispatch_hook;
+ change_output();
run_request();
+ reset_output();
+ print $output;
$post_dispatch_hook->()
if $post_dispatch_hook;
@@ -3655,6 +3680,10 @@ sub die_error {
500 => '500 Internal Server Error',
503 => '503 Service Unavailable',
);
+ # Reset the output so that we are actually going to STDOUT as opposed
+ # to buffering the output.
+ reset_output();
+
git_header_html($http_responses{$status}, undef, %opts);
print <<EOF;
<div class="page_body">
--
1.7.2.3
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html