make Plack optional for non-WWW and non-httpd users

[public-inbox.git] / script / public-inbox-httpd

diff --git a/script/public-inbox-httpd b/script/public-inbox-httpd
index 9b869f906032ed8e090f60d3c92ca62792ab47de..09da505e5028952a60551f7bd2ffc25cf57c7780 100755 (executable)
--- a/script/public-inbox-httpd
+++ b/script/public-inbox-httpd
@@ -1,15 +1,18 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Standalone HTTP server for public-inbox.
 use strict;
-use warnings;
-use Plack::Util;
 use PublicInbox::Daemon;
-use PublicInbox::HTTP;
-use PublicInbox::HTTPD;
-use Plack::Builder;
+BEGIN {
+       for (qw(Plack::Builder Plack::Util)) {
+               eval("require $_") or die "E: Plack is required for $0\n";
+       }
+       Plack::Builder->import;
+       require PublicInbox::HTTP;
+       require PublicInbox::HTTPD;
+}
 my %httpds;
 my $app;
 my $refresh = sub {
@@ -24,13 +27,7 @@ my $refresh = sub {
                my $www = PublicInbox::WWW->new;
                $www->preload;
                $app = builder {
-                       # Perl 5.16.3 leaks in our "push" response code path
-                       # (e.g. Qspawn) due to something in
-                       # Plack::Util::response_cb, regardless of whether the
-                       # client is sending Accept-Encoding:gzip requests.
-                       # perl5180delta documents many leak fixes, so assume
-                       # 5.18+ is safe for now and bump the check as-need:
-                       $] >= 5.018000 and eval {
+                       eval {
                                enable 'Deflater',
                                        content_type => [ qw(
                                                text/html