update copyrights for 2018

[public-inbox.git] / lib / PublicInbox / HTTPD / Async.pm

diff --git a/lib/PublicInbox/HTTPD/Async.pm b/lib/PublicInbox/HTTPD/Async.pm
index 880cf021cef763a97ea9add08cea295d4c9789fa..842aaf62e93fbfd22ceabc25269857c9282d1c99 100644 (file)
--- a/lib/PublicInbox/HTTPD/Async.pm
+++ b/lib/PublicInbox/HTTPD/Async.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2018 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # XXX This is a totally unstable API for public-inbox internal use only
@@ -10,7 +10,6 @@ use strict;
 use warnings;
 use base qw(Danga::Socket);
 use fields qw(cb cleanup);
-use Scalar::Util qw(weaken);
 require PublicInbox::EvCleanup;
 
 sub new {
@@ -29,22 +28,17 @@ sub restart_read_cb ($) {
        sub { $self->watch_read(1) }
 }
 
-sub async_pass {
-       my ($self, $io, $fh, $bref) = @_;
-       # In case the client HTTP connection ($io) dies, it
-       # will automatically close this ($self) object.
-       $io->{forward} = $self;
-       $fh->write($$bref);
-       my $restart_read = restart_read_cb($self);
-       weaken($self);
-       $self->{cb} = sub {
+sub main_cb ($$$) {
+       my ($http, $fh, $bref) = @_;
+       sub {
+               my ($self) = @_;
                my $r = sysread($self->{sock}, $$bref, 8192);
                if ($r) {
                        $fh->write($$bref);
-                       return if $io->{closed};
-                       if ($io->{write_buf_size}) {
+                       return if $http->{closed};
+                       if ($http->{write_buf_size}) {
                                $self->watch_read(0);
-                               $io->write($restart_read); # D::S::write
+                               $http->write(restart_read_cb($self));
                        }
                        # stay in watch_read, but let other clients
                        # get some work done, too.
@@ -55,14 +49,23 @@ sub async_pass {
 
                # Done! Error handling will happen in $fh->close
                # called by the {cleanup} handler
-               $io->{forward} = undef;
+               $http->{forward} = undef;
                $self->close;
        }
 }
 
-sub event_read { $_[0]->{cb}->() }
-sub event_hup { $_[0]->{cb}->() }
-sub event_err { $_[0]->{cb}->() }
+sub async_pass {
+       my ($self, $http, $fh, $bref) = @_;
+       # In case the client HTTP connection ($http) dies, it
+       # will automatically close this ($self) object.
+       $http->{forward} = $self;
+       $fh->write($$bref); # PublicInbox:HTTP::{chunked,identity}_wcb
+       $self->{cb} = main_cb($http, $fh, $bref);
+}
+
+sub event_read { $_[0]->{cb}->(@_) }
+sub event_hup { $_[0]->{cb}->(@_) }
+sub event_err { $_[0]->{cb}->(@_) }
 sub sysread { shift->{sock}->sysread(@_) }
 
 sub close {
@@ -72,7 +75,7 @@ sub close {
        $self->SUPER::close(@_);
 
        # we defer this to the next timer loop since close is deferred
-       PublicInbox::EvCleanup::asap($cleanup) if $cleanup;
+       PublicInbox::EvCleanup::next_tick($cleanup) if $cleanup;
 }
 
 1;