]> Sergey Matveev's repositories - public-inbox.git/blobdiff - script/public-inbox-httpd
make Plack optional for non-WWW and non-httpd users
[public-inbox.git] / script / public-inbox-httpd
index f1a5d7992a4e539a261bfee044378922f9abea6f..09da505e5028952a60551f7bd2ffc25cf57c7780 100755 (executable)
@@ -1,15 +1,18 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2016 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 Plack::Request;
-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 {
@@ -21,115 +24,33 @@ my $refresh = sub {
                }
        } else {
                require PublicInbox::WWW;
-               PublicInbox::WWW->preload;
                my $www = PublicInbox::WWW->new;
-               $app = eval {
-                       builder {
-                               enable 'Chunked';
-                               eval {
-                                       enable 'Deflater',
-                                               content_type => [ qw(
-                                                       text/html
-                                                       text/plain
-                                                       application/atom+xml
-                                                       )]
-                               };
-                               $@ and warn
-"Plack::Middleware::Deflater missing, bandwidth will be wasted\n";
+               $www->preload;
+               $app = builder {
+                       eval {
+                               enable 'Deflater',
+                                       content_type => [ qw(
+                                               text/html
+                                               text/plain
+                                               application/atom+xml
+                                               )]
+                       };
 
-                               eval { enable 'ReverseProxy' };
-                               $@ and warn
+                       eval { enable 'ReverseProxy' };
+                       $@ and warn
 "Plack::Middleware::ReverseProxy missing,\n",
 "URL generation for redirects may be wrong if behind a reverse proxy\n";
 
-                               enable 'Head';
-                               sub { $www->call(@_) };
-                       };
+                       enable 'Head';
+                       sub { $www->call(@_) };
                };
        }
 };
 
-daemon_run('0.0.0.0:8080', $refresh,
+PublicInbox::Daemon::run('0.0.0.0:8080', $refresh,
        sub ($$$) { # post_accept
                my ($client, $addr, $srv) = @_;
                my $fd = fileno($srv);
                my $h = $httpds{$fd} ||= PublicInbox::HTTPD->new($srv, $app);
                PublicInbox::HTTP->new($client, $addr, $h),
        });
-
-1;
-
-package PublicInbox::HTTPD::Async;
-use strict;
-use warnings;
-use base qw(Danga::Socket);
-use fields qw(cb);
-
-sub new {
-       my ($class, $io, $cb) = @_;
-       my $self = fields::new($class);
-       IO::Handle::blocking($io, 0);
-       $self->SUPER::new($io);
-       $self->{cb} = $cb;
-       $self->watch_read(1);
-       $self;
-}
-
-sub event_read { $_[0]->{cb}->() }
-sub event_hup { $_[0]->{cb}->() }
-sub event_err { $_[0]->{cb}->() }
-sub sysread { shift->{sock}->sysread(@_) }
-
-1;
-
-package PublicInbox::HTTPD;
-use strict;
-use warnings;
-use Plack::Util;
-
-sub pi_httpd_async {
-       my ($io, $cb) = @_;
-       PublicInbox::HTTPD::Async->new($io, $cb);
-}
-
-sub new {
-       my ($class, $sock, $app) = @_;
-       my $n = getsockname($sock) or die "not a socket: $sock $!\n";
-       my ($port, $addr);
-       if (length($n) >= 28) {
-               require Socket6;
-               ($port, $addr) = Socket6::unpack_sockaddr_in6($n);
-       } else {
-               ($port, $addr) = Socket::unpack_sockaddr_in($n);
-       }
-
-       my %env = (
-               REMOTE_HOST => '',
-               REMOTE_PORT => 0,
-               SERVER_NAME => $addr,
-               SERVER_PORT => $port,
-               SCRIPT_NAME => '',
-               'psgi.version' => [ 1, 1 ],
-               'psgi.errors' => \*STDERR,
-               'psgi.url_scheme' => 'http',
-               'psgi.nonblocking' => Plack::Util::TRUE,
-               'psgi.streaming' => Plack::Util::TRUE,
-               'psgi.run_once'  => Plack::Util::FALSE,
-               'psgi.multithread' => Plack::Util::FALSE,
-               'psgi.multiprocess' => Plack::Util::TRUE,
-               'psgix.harakiri'=> Plack::Util::FALSE,
-               'psgix.input.buffered' => Plack::Util::TRUE,
-               'pi-httpd.async' => do {
-                       no warnings 'once';
-                       *pi_httpd_async
-               },
-       );
-       bless {
-               err => \*STDERR,
-               out => \*STDOUT,
-               app => $app,
-               env => \%env,
-       }, $class;
-}
-
-1;