make zlib-related modules a hard dependency

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

diff --git a/lib/PublicInbox/Mbox.pm b/lib/PublicInbox/Mbox.pm
index 46964bbb77cc5e49584dd35ea67c77ecaa221356..97bec5e79a3b468b88faa0b2e8ac72bbf198552f 100644 (file)
--- a/lib/PublicInbox/Mbox.pm
+++ b/lib/PublicInbox/Mbox.pm
@@ -13,6 +13,7 @@ use warnings;
 use PublicInbox::MID qw/mid_escape/;
 use PublicInbox::Hval qw/to_filename/;
 use PublicInbox::Smsg;
+use PublicInbox::WwwStream qw(html_oneshot);
 use Email::Simple;
 use Email::MIME::Encode;
 
@@ -43,19 +44,16 @@ sub getline {
        my ($ctx, $id, $prev, $next, $mref, $hdr) = @$more;
        if ($hdr) { # first message hits this, only
                pop @$more; # $hdr
-               return msg_hdr($ctx, $hdr);
-       }
-       if ($mref) { # all messages hit this
                pop @$more; # $mref
-               return msg_body($$mref);
+               return msg_hdr($ctx, $hdr) . msg_body($$mref);
        }
        my $cur = $next or return;
        my $ibx = $ctx->{-inbox};
        $next = $ibx->over->next_by_mid($ctx->{mid}, \$id, \$prev);
        $mref = $ibx->msg_by_smsg($cur) or return;
        $hdr = Email::Simple->new($mref)->header_obj;
-       @$more = ($ctx, $id, $prev, $next, $mref); # $next may be undef, here
-       msg_hdr($ctx, $hdr); # all but first message hits this
+       @$more = ($ctx, $id, $prev, $next); # $next may be undef, here
+       msg_hdr($ctx, $hdr) . msg_body($$mref);
 }
 
 sub close {} # noop
@@ -108,8 +106,11 @@ sub msg_hdr ($$;$) {
                'List-Post', "<mailto:$ibx->{-primary_address}>",
        );
        my $crlf = $header_obj->crlf;
-       my $buf = "From mboxrd\@z Thu Jan  1 00:00:00 1970\n" .
-                       $header_obj->as_string;
+       my $buf = $header_obj->as_string;
+       # fixup old bug from import (pre-a0c07cba0e5d8b6a)
+       $buf =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s;
+       $buf = "From mboxrd\@z Thu Jan  1 00:00:00 1970" . $crlf . $buf;
+
        for (my $i = 0; $i < @append; $i += 2) {
                my $k = $append[$i];
                my $v = $append[$i + 1];
@@ -151,8 +152,7 @@ sub thread_cb {
 
 sub thread_mbox {
        my ($ctx, $over, $sfx) = @_;
-       eval { require PublicInbox::MboxGz };
-       return need_gzip($ctx) if $@;
+       require PublicInbox::MboxGz;
        my $msgs = $ctx->{msgs} = $over->get_thread($ctx->{mid}, {});
        return [404, [qw(Content-Type text/plain)], []] if !@$msgs;
        $ctx->{prev} = $msgs->[-1];
@@ -220,8 +220,7 @@ sub results_cb {
 sub mbox_all {
        my ($ctx, $query) = @_;
 
-       eval { require PublicInbox::MboxGz };
-       return need_gzip($ctx) if $@;
+       require PublicInbox::MboxGz;
        return mbox_all_ids($ctx) if $query eq '';
        my $qopts = $ctx->{qopts} = { mset => 2 };
        my $srch = $ctx->{srch} = $ctx->{-inbox}->search or
@@ -235,15 +234,4 @@ sub mbox_all {
        PublicInbox::MboxGz->response($ctx, \&results_cb, 'results-'.$query);
 }
 
-sub need_gzip {
-       PublicInbox::WwwStream::oneshot($_[0], 501, \<<EOF);
-<pre>gzipped mbox not available
-
-The administrator needs to install the Compress::Raw::Zlib Perl module
-to support gzipped mboxes.
-
-<a href="../">Return to index</a></pre>
-EOF
-}
-
 1;