Merge remote-tracking branch 'origin/newspeak' into xcpdb

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

diff --git a/lib/PublicInbox/HTTPD/Async.pm b/lib/PublicInbox/HTTPD/Async.pm
index a1f7551819700e1a48d91f7aa36818a4e5a3ee80..4d0c8d5bc93eb86182888e3e10d570857ea2d121 100644 (file)
--- a/lib/PublicInbox/HTTPD/Async.pm
+++ b/lib/PublicInbox/HTTPD/Async.pm
@@ -8,12 +8,21 @@
 package PublicInbox::HTTPD::Async;
 use strict;
 use warnings;
-use base qw(Danga::Socket);
+use base qw(PublicInbox::DS);
 use fields qw(cb cleanup);
 require PublicInbox::EvCleanup;
 
 sub new {
        my ($class, $io, $cb, $cleanup) = @_;
+
+       # no $io? call $cb at the top of the next event loop to
+       # avoid recursion:
+       unless (defined($io)) {
+               PublicInbox::EvCleanup::asap($cb) if $cb;
+               PublicInbox::EvCleanup::next_tick($cleanup) if $cleanup;
+               return;
+       }
+
        my $self = fields::new($class);
        IO::Handle::blocking($io, 0);
        $self->SUPER::new($io);
@@ -36,8 +45,8 @@ sub main_cb ($$$) {
                my $r = sysread($self->{sock}, $$bref, 8192);
                if ($r) {
                        $fh->write($$bref);
-                       unless ($http->{closed}) { # Danga::Socket sets this
-                               if ($http->{write_buf_size}) {
+                       unless ($http->{closed}) { # PublicInbox::DS sets this
+                               if (scalar @{$http->{wbuf}}) {
                                        $self->watch_read(0);
                                        $http->write(restart_read_cb($self));
                                }
@@ -67,8 +76,6 @@ sub async_pass {
 }
 
 sub event_read { $_[0]->{cb}->(@_) }
-sub event_hup { $_[0]->{cb}->(@_) }
-sub event_err { $_[0]->{cb}->(@_) }
 
 sub close {
        my $self = shift;