bundle Danga::Socket and Sys::Syscall

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

diff --git a/lib/PublicInbox/HTTPD/Async.pm b/lib/PublicInbox/HTTPD/Async.pm
index a9a9573b28cf4609f1880ece72034cb3e6e7aa3c..dbe8a84abbbd3291116e816a919073d7422c01cb 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,14 +45,16 @@ sub main_cb ($$$) {
                my $r = sysread($self->{sock}, $$bref, 8192);
                if ($r) {
                        $fh->write($$bref);
-                       return if $http->{closed};
-                       if ($http->{write_buf_size}) {
-                               $self->watch_read(0);
-                               $http->write(restart_read_cb($self));
+                       unless ($http->{closed}) { # PublicInbox::DS sets this
+                               if ($http->{write_buf_size}) {
+                                       $self->watch_read(0);
+                                       $http->write(restart_read_cb($self));
+                               }
+                               # stay in watch_read, but let other clients
+                               # get some work done, too.
+                               return;
                        }
-                       # stay in watch_read, but let other clients
-                       # get some work done, too.
-                       return;
+                       # fall through to close below...
                } elsif (!defined $r) {
                        return if $!{EAGAIN} || $!{EINTR};
                }