X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/442a38fd7f907e3341978a9505ff34f2ddf5764c..v1.9-294-gb3b5d17665:/common.inc.plp?ds=sidebyside
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 "
$body
\n";
}
-$PLP::ERROR = sub {
- my ($text, $html) = @_;
- Alert("Fatal error: $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 'Page unavailable
';
+ }
+ Alert("Fatal error: $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