X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;ds=sidebyside;f=script%2Fpublic-inbox-httpd;h=caceae203b894015848d4c48e57b8ff5a5928be3;hb=d0bc58517c97c8982fdf42533297d96be9efb484;hp=d867b47718e764454b6472c7dcd8311b9ccae37d;hpb=b8e30717b529d6461190b54efa8c6402197cdd4e;p=public-inbox.git
diff --git a/script/public-inbox-httpd b/script/public-inbox-httpd
index d867b477..caceae20 100755
--- a/script/public-inbox-httpd
+++ b/script/public-inbox-httpd
@@ -1,137 +1,8 @@
-#!/usr/bin/perl -w
-# Copyright (C) 2016 all contributors
+#!perl -w
+# Copyright (C) all contributors
# License: AGPL-3.0+
#
# Standalone HTTP server for public-inbox.
-use strict;
-use warnings;
-use Plack::Util;
+use v5.12;
use PublicInbox::Daemon;
-use PublicInbox::HTTP;
-use Plack::Request;
-use Plack::Builder;
-my %httpds;
-my $app;
-my $refresh = sub {
- if (@ARGV) {
- eval { $app = Plack::Util::load_psgi(@ARGV) };
- if ($@) {
- die $@,
-"$0 runs in /, command-line paths must be absolute\n";
- }
- } 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";
-
- 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(@_) };
- };
- };
- }
-};
-
-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;
-
-# XXX This is a totally unstable API for public-inbox internal use only
-# This is exposed via the 'pi-httpd.async' key in the PSGI env hash.
-# The name of this key is not even stable!
-# Currently is is intended for use with read-only pipes.
-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 {
- app => $app,
- env => \%env,
- }, $class;
-}
-
-1;
+PublicInbox::Daemon::run('http://0.0.0.0:8080');