[PATCH 14/18] gitweb: add print_transient_header() function for central header printing
From: "John 'Warthog9' Hawley" <warthog9@eaglescrag.net>
Date: 2016-06-15 22:50:13
Subsystem:
the rest · Maintainer:
Linus Torvalds
There are a few things I would like to reuse the transient header information I'm using, currently this is only the 'Generating...' page, but there is at least one additional warning page I would like to use this on. Signed-off-by: John 'Warthog9' Hawley <warthog9@eaglescrag.net> --- gitweb/lib/cache.pl | 47 ++++++++++++++++++++++++++--------------------- 1 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/gitweb/lib/cache.pl b/gitweb/lib/cache.pl
index 63dbe9e..723ae9b 100644
--- a/gitweb/lib/cache.pl
+++ b/gitweb/lib/cache.pl@@ -94,6 +94,31 @@ sub cache_fetch { #$actions{$action}->(); } +sub print_transient_header { + print $::cgi->header( + -type=>'text/html', + -charset => 'utf-8', + -status=> 200, + -expires => 'now', + # HTTP/1.0 + -Pragma => 'no-cache', + # HTTP/1.1 + -Cache_Control => join( + ', ', + qw( + private + no-cache + no-store + must-revalidate + max-age=0 + pre-check=0 + post-check=0 + ) + ) + ); + return; +} + sub isBinaryAction { my ($action) = @_;
@@ -292,27 +317,7 @@ sub cacheWaitForUpdate { $| = 1; - print $::cgi->header( - -type=>'text/html', - -charset => 'utf-8', - -status=> 200, - -expires => 'now', - # HTTP/1.0 - -Pragma => 'no-cache', - # HTTP/1.1 - -Cache_Control => join( - ', ', - qw( - private - no-cache - no-store - must-revalidate - max-age=0 - pre-check=0 - post-check=0 - ) - ) - ); + print_transient_header(); print <<EOF; <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www/w3.porg/TR/html4/strict.dtd">
--
1.7.2.3