treewide: run update-copyrights from gnulib for 2019

[public-inbox.git] / lib / PublicInbox / MboxGz.pm

diff --git a/lib/PublicInbox/MboxGz.pm b/lib/PublicInbox/MboxGz.pm
index 2a55447f84e873b7fedb0db4b969128856c7eb5a..e506de3da0ea52566e958ab8ac09462d8c1217db 100644 (file)
--- a/lib/PublicInbox/MboxGz.pm
+++ b/lib/PublicInbox/MboxGz.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 package PublicInbox::MboxGz;
 use strict;
@@ -6,7 +6,6 @@ use warnings;
 use Email::Simple;
 use PublicInbox::Hval qw/to_filename/;
 use PublicInbox::Mbox;
-use IO::Compress::Gzip;
 use Compress::Raw::Zlib qw(Z_FINISH Z_OK);
 my %OPT = (-WindowBits => 15 + 16, -AppendOutput => 1);
 
@@ -22,12 +21,10 @@ sub response {
        my ($class, $ctx, $cb, $fn) = @_;
        my $body = $class->new($ctx, $cb);
        # http://www.iana.org/assignments/media-types/application/gzip
-       my @h = qw(Content-Type application/gzip);
-       if ($fn) {
-               $fn = to_filename($fn);
-               push @h, 'Content-Disposition', "inline; filename=$fn.mbox.gz";
-       }
-       [ 200, \@h, $body ];
+       $fn = defined($fn) && $fn ne '' ? to_filename($fn) : 'no-subject';
+       my $h = [ qw(Content-Type application/gzip),
+               'Content-Disposition', "inline; filename=$fn.mbox.gz" ];
+       [ 200, $h, $body ];
 }
 
 sub gzip_fail ($$) {
@@ -42,7 +39,7 @@ sub getline {
        my $ctx = $self->{ctx} or return;
        my $gz = $self->{gz};
        my $buf = delete($self->{buf});
-       while (my $smsg = $self->{cb}->()) {
+       while (my $smsg = $self->{cb}->($ctx)) {
                my $mref = $ctx->{-inbox}->msg_by_smsg($smsg) or next;
                my $h = Email::Simple->new($mref)->header_obj;
 
@@ -63,7 +60,7 @@ sub getline {
        # signal that we're done and can return undef next call:
        delete $self->{ctx};
        my $err = $gz->flush($buf, Z_FINISH);
-       $err == Z_OK ? $buf : gzip_fail($ctx, $err);
+       ($err == Z_OK) ? $buf : gzip_fail($ctx, $err);
 }
 
 sub close {} # noop