update copyrights for 2018

[public-inbox.git] / lib / PublicInbox / GetlineBody.pm

diff --git a/lib/PublicInbox/GetlineBody.pm b/lib/PublicInbox/GetlineBody.pm
index 4f8765bbe6e7bfd37d67f23a7343fe99535b389a..7fcd7c03554cb7791136ad4a14dc3f917b890f8c 100644 (file)
--- a/lib/PublicInbox/GetlineBody.pm
+++ b/lib/PublicInbox/GetlineBody.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>
 
 # Wrap a pipe or file for PSGI streaming response bodies and calls the
@@ -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;