From 8080aa02383623837770ae12aba85f010442a1f6 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 27 May 2016 08:20:58 +0000 Subject: git-http-backend: move real close to GetlineBody This makes more sense as it keeps management of rpipe nice and neat. --- lib/PublicInbox/GetlineBody.pm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'lib/PublicInbox/GetlineBody.pm') diff --git a/lib/PublicInbox/GetlineBody.pm b/lib/PublicInbox/GetlineBody.pm index 4f8765bb..5f327828 100644 --- a/lib/PublicInbox/GetlineBody.pm +++ b/lib/PublicInbox/GetlineBody.pm @@ -13,19 +13,23 @@ sub new { bless { rpipe => $rpipe, end => $end, buf => $buf }, $class; } +# close should always be called after getline returns undef, +# but a client aborting a connection can ruin our day; so lets +# hope our underlying PSGI server does not leak references, here. sub DESTROY { $_[0]->close } sub getline { my ($self) = @_; - my $buf = delete $self->{buf}; + my $buf = delete $self->{buf}; # initial buffer defined $buf ? $buf : $self->{rpipe}->getline; } sub close { my ($self) = @_; - delete $self->{rpipe}; - my $end = delete $self->{end} or return; - $end->(); + my $rpipe = delete $self->{rpipe}; + close $rpipe if $rpipe; + my $end = delete $self->{end}; + $end->() if $end; } 1; -- cgit v1.2.3-24-ge0c7