[PATCH 0/2] git-http-backend: more cleanups + one fix

[PATCH 0/2] git-http-backend: more cleanups + one fix

[Eric Wong]

Eric Wong (2):
      git-http-backend: move real close to GetlineBody
      git-http-backend: close pipe for generic PSGI on errors

 lib/PublicInbox/GetlineBody.pm    | 12 ++++++++----
 lib/PublicInbox/GitHTTPBackend.pm |  8 ++++++--
 2 files changed, 14 insertions(+), 6 deletions(-)

[PATCH 1/2] git-http-backend: move real close to GetlineBody

[Eric Wong]

This makes more sense as it keeps management of rpipe
nice and neat.
---
 lib/PublicInbox/GetlineBody.pm    | 12 ++++++++----
 lib/PublicInbox/GitHTTPBackend.pm |  1 -
 2 files changed, 8 insertions(+), 5 deletions(-)

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);

[PATCH 2/2] git-http-backend: close pipe for generic PSGI on errors

[Eric Wong]

The generic PSGI code needs to avoid resource leaks if
smart cloning is disabled (due to resource contraints).
---
 lib/PublicInbox/GitHTTPBackend.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/PublicInbox/GitHTTPBackend.pm b/lib/PublicInbox/GitHTTPBackend.pm
index 1819444..58e75cd 100644
--- a/lib/PublicInbox/GitHTTPBackend.pm
+++ b/lib/PublicInbox/GitHTTPBackend.pm
@@ -210,7 +210,12 @@ sub serve_smart {
 		my $r = $rd_hdr->() or return;
 		$rd_hdr = undef;
 		if (scalar(@$r) == 3) { # error:
-			$async->close if $async;
+			if ($async) {
+				$async->close; # calls rpipe->close
+			} else {
+				$rpipe->close;
+				$end->();
+			}
 			return $res->($r);
 		}
 		if ($async) {