about summary refs log tree commit homepage
path: root/lib/PublicInbox/Mbox.pm
diff options
context:
space:
mode:
authorEric Wong <e@yhbt.net>2020-04-21 06:57:34 +0000
committerEric Wong <e@yhbt.net>2020-04-22 07:04:45 +0000
commita318e758129d616b3b801db82c4735c680a2fbe8 (patch)
treeba9af6a937ecf8f2a7dc339a25f1ad2a0c0ddc75 /lib/PublicInbox/Mbox.pm
parenta45aef4d6415553dd1f6744770b00ea9033f58d7 (diff)
downloadpublic-inbox-a318e758129d616b3b801db82c4735c680a2fbe8.tar.gz
This allows us to simplify some of our existing code and make
future changes easier.

I doubt anybody goes through the trouble to have a Perl
installation without zlib support.  The zlib source code is even
bundled with Perl since 5.9.3 for systems without existing zlib
development headers and libraries.

Of course, zlib is also a requirement of git, too; and we're not
going to stop using git :)

[squashed: "wwwaltid: use gzipfilter up front"]
Diffstat (limited to 'lib/PublicInbox/Mbox.pm')
-rw-r--r--lib/PublicInbox/Mbox.pm17
1 files changed, 2 insertions, 15 deletions
diff --git a/lib/PublicInbox/Mbox.pm b/lib/PublicInbox/Mbox.pm
index 9995140c..97bec5e7 100644
--- a/lib/PublicInbox/Mbox.pm
+++ b/lib/PublicInbox/Mbox.pm
@@ -152,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];
@@ -221,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
@@ -236,15 +234,4 @@ sub mbox_all {
         PublicInbox::MboxGz->response($ctx, \&results_cb, 'results-'.$query);
 }
 
-sub need_gzip {
-        html_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;