summaryrefslogtreecommitdiff
path: root/lib/XXV/OUTPUT
diff options
context:
space:
mode:
authorAndreas Brachold <vdr07@deltab.de>2007-11-09 19:00:06 +0000
committerAndreas Brachold <vdr07@deltab.de>2007-11-09 19:00:06 +0000
commit9c6c30350161efd74faa3c3705096aecb71c0e81 (patch)
tree52ca590d63cbe15f3ab37d649a55d1e2936b2a3e /lib/XXV/OUTPUT
parentaa99123685e85b53583a491febe269c9dceb8222 (diff)
downloadxxv-9c6c30350161efd74faa3c3705096aecb71c0e81.tar.gz
xxv-9c6c30350161efd74faa3c3705096aecb71c0e81.tar.bz2
* RECORDS: Update file size, if recording running
* RECORDS: Assign EPG-event fail if event with subtitle, but timer without subtitle programmed * HTTPD: Fix warning if output_header undefined (only by waiter)
Diffstat (limited to 'lib/XXV/OUTPUT')
-rw-r--r--lib/XXV/OUTPUT/Html.pm16
1 files changed, 10 insertions, 6 deletions
diff --git a/lib/XXV/OUTPUT/Html.pm b/lib/XXV/OUTPUT/Html.pm
index a553911..fc7cdba 100644
--- a/lib/XXV/OUTPUT/Html.pm
+++ b/lib/XXV/OUTPUT/Html.pm
@@ -331,18 +331,22 @@ sub printout {
if($obj->{output} && $obj->{handle}) {
my $content;
if($obj->{browser}->{Method} ne 'HEAD') {
- $content = $obj->{output};
-
- $content = Compress::Zlib::memGzip($content)
- if(! $nopack and $obj->{Zlib} and $obj->{browser}->{accept_gzip});
+ if(! $nopack and $obj->{Zlib} and $obj->{browser}->{accept_gzip}) {
+ $content = Compress::Zlib::memGzip($obj->{output});
+ } else {
+ $content = $obj->{output};
+ }
}
- if($content) {
+ if($obj->{output_header} && $content) {
$obj->{handle}->print($obj->{output_header},$content);
$obj->{sendbytes}+= length($obj->{output_header});
$obj->{sendbytes}+= length($content);
- } else {
+ } elsif($obj->{output_header}) {
$obj->{handle}->print($obj->{output_header});
$obj->{sendbytes}+= length($obj->{output_header});
+ } elsif($content) {
+ $obj->{handle}->print($content);
+ $obj->{sendbytes}+= length($content);
}
$obj->{handle}->close();
}