X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/442a38fd7f907e3341978a9505ff34f2ddf5764c..03abf85a7ec9775993766a3fd10cd2876aef0b42:/common.inc.plp

diff --git a/common.inc.plp b/common.inc.plp
index 6b45e50..4c7fbb9 100644
--- a/common.inc.plp
+++ b/common.inc.plp
@@ -20,20 +20,25 @@ sub Alert {
 	say "<div class=error>$body</div>\n";
 }
 
-$PLP::ERROR = sub {
-	my ($text, $html) = @_;
-	Alert("<strong>Fatal error</strong>: $html.");
-	warn $text;
-};
-
 BEGIN {
 	require Time::HiRes;
 	our $Time = [Time::HiRes::gettimeofday()];
+
+	$PLP::ERROR = sub {
+		my ($text, $html) = @_;
+		warn $text;
+		unless ($PLP::sentheaders and $PLP::sentheaders->[0] !~ m{/PLP\.pm\z}) {
+			Html({nocache => 1});
+			say '<h1>Page unavailable</h1>';
+		}
+		Alert("<strong>Fatal error</strong>: $html.");
+	};
+
+	# user request
+	our $Dev = $ENV{HTTP_HOST} =~ /\bdev\./;
+	our ($file) = $ENV{SCRIPT_FILENAME} =~ m{ ([^/]+) \.plp$ }x;
 }
 
-# user request
-our $Dev = $ENV{HTTP_HOST} =~ /\bdev\./;
-our ($file) = $ENV{SCRIPT_FILENAME} =~ m{ ([^/]+) \.plp$ }x;
 our $Request = decode_utf8($ENV{PATH_INFO} =~ s{^/}{}r);
 
 our $style;
@@ -89,13 +94,15 @@ sub checkmodified {
 sub Html {
 	my ($meta) = @_;
 
-	# announce and check data modification
-	checkmodified(
-		$ENV{SCRIPT_FILENAME},
-		(grep { /\bShiar_/ } values %INC),
-		$meta->{data} ? @{ $meta->{data} } : (),
-	);
-	$header{'Cache-Control'} = sprintf 'max-age: ', 24*60*60;
+	unless ($meta->{nocache}) {
+		# announce and check data modification
+		checkmodified(
+			$ENV{SCRIPT_FILENAME},
+			(grep { /\bShiar_/ } values %INC),
+			$meta->{data} ? @{ $meta->{data} } : (),
+		);
+		$header{'Cache-Control'} = 'max-age='.(24*60*60);
+	}
 
 	# default fallbacks
 	$meta->{stylesheet} ||= [qw'light dark circus mono red terse'];
@@ -106,7 +113,8 @@ sub Html {
 		for grep {$_} $meta->{raw}, $meta->{description}, $meta->{keywords};
 
 	# document headers before output
-	$header{content_type} = "text/html; charset=$meta->{charset}";
+	$header{content_type} = "text/html; charset=$meta->{charset}"
+		unless $PLP::sentheaders;
 	unshift @{ $meta->{raw} }, stylesheet($meta->{stylesheet});
 
 	# optional amends