From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <normalperson@yhbt.net>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net
X-Spam-Level: 
X-Spam-ASN:  
X-Spam-Status: No, score=-4.4 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00,
	RP_MATCHES_RCVD,URIBL_BLOCKED shortcircuit=no autolearn=unavailable
	autolearn_force=no version=3.4.0
Received: from localhost (dcvr.yhbt.net [127.0.0.1])
	by dcvr.yhbt.net (Postfix) with ESMTP id 10E181F992;
	Fri, 27 May 2016 07:11:34 +0000 (UTC)
Date: Fri, 27 May 2016 07:11:33 +0000
From: Eric Wong <normalperson@yhbt.net>
To: spew@80x24.org
Subject: wip
Message-ID: <20160527071133.GA20493@dcvr.yhbt.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
List-Id: <spew@80x24.org>

diff --git a/lib/PublicInbox/GetlineBody.pm b/lib/PublicInbox/GetlineBody.pm
index 4f8765b..5f32782 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 fd7afbc..1819444 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);
diff --git a/lib/PublicInbox/HTTP.pm b/lib/PublicInbox/HTTP.pm
index 0454f60..321eb40 100644
--- a/lib/PublicInbox/HTTP.pm
+++ b/lib/PublicInbox/HTTP.pm
@@ -266,6 +266,9 @@ sub getline_response {
 		while ($forward && defined(my $buf = $forward->getline)) {
 			$write->($buf);
 			last if $self->{closed};
+
+			# do not read more of the body until the client can
+			# catch up, we do not want to OOM on slow clients.
 			if ($self->{write_buf_size}) {
 				$self->write($self->{pull});
 				return;