]> Sergey Matveev's repositories - public-inbox.git/commitdiff
httpd/async: do not needlessly weaken
authorEric Wong <e@80x24.org>
Fri, 27 May 2016 07:23:18 +0000 (07:23 +0000)
committerEric Wong <e@80x24.org>
Fri, 27 May 2016 07:27:43 +0000 (07:27 +0000)
The restart_read callback has no chance of circular reference,
and weakening $self before we create it can cause $self to
be undefined inside the callback (seen during stress testing).

Fixes: 395406118cb2 ("httpd/async: prevent circular reference")
lib/PublicInbox/HTTPD/Async.pm

index b00e63701495a73635874e702e16addb62985d6b..add07ce481b86e2a755aa0eb52b67628201b30a8 100644 (file)
@@ -24,14 +24,19 @@ sub new {
        $self;
 }
 
+sub restart_read_cb ($) {
+       my ($self) = @_;
+       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);
-       my $restart_read = sub { $self->watch_read(1) };
        $self->{cb} = sub {
                my $r = sysread($self->{sock}, $$bref, 8192);
                if ($r) {