about summary refs log tree commit homepage
path: root/lib
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2016-05-27 08:20:58 +0000
committerEric Wong <e@80x24.org>2016-05-27 08:24:01 +0000
commit8080aa02383623837770ae12aba85f010442a1f6 (patch)
tree2b72a8a6a0b6b6e23c6dc5aafa433d9cd476e954 /lib
parentaa4e04c633ee857cb372d7e55c545d7a7b29d2eb (diff)
downloadpublic-inbox-8080aa02383623837770ae12aba85f010442a1f6.tar.gz
This makes more sense as it keeps management of rpipe
nice and neat.
Diffstat (limited to 'lib')
-rw-r--r--lib/PublicInbox/GetlineBody.pm12
-rw-r--r--lib/PublicInbox/GitHTTPBackend.pm1
2 files changed, 8 insertions, 5 deletions
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;
diff --git a/lib/PublicInbox/GitHTTPBackend.pm b/lib/PublicInbox/GitHTTPBackend.pm
index fd7afbcc..18194441 100644
--- a/lib/PublicInbox/GitHTTPBackend.pm
+++ b/lib/PublicInbox/GitHTTPBackend.pm
@@ -186,7 +186,6 @@ sub serve_smart {
         my $x = PublicInbox::Qspawn->new([qw(git http-backend)], \%env, \%rdr);
         my ($fh, $rpipe);
         my $end = sub {
-                close $rpipe if $rpipe && !$fh; # generic PSGI
                 if (my $err = $x->finish) {
                         err($env, "git http-backend ($git_dir): $err");
                         drop_client($env);