From 79e11eea11dd561301a05c42ba824a7d352bd398 Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Fri, 27 May 2016 05:59:16 +0000
Subject: git-http-backend: fix aborts for generic PSGI clone

We need to avoid circular references in the generic PSGI layer,
do it by abusing DESTROY.
---
 lib/PublicInbox/GitHTTPBackend.pm | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'lib/PublicInbox/GitHTTPBackend.pm')

diff --git a/lib/PublicInbox/GitHTTPBackend.pm b/lib/PublicInbox/GitHTTPBackend.pm
index 9464cb49..fd7afbcc 100644
--- a/lib/PublicInbox/GitHTTPBackend.pm
+++ b/lib/PublicInbox/GitHTTPBackend.pm
@@ -186,7 +186,7 @@ sub serve_smart {
 	my $x = PublicInbox::Qspawn->new([qw(git http-backend)], \%env, \%rdr);
 	my ($fh, $rpipe);
 	my $end = sub {
-		$rpipe = undef;
+		close $rpipe if $rpipe && !$fh; # generic PSGI
 		if (my $err = $x->finish) {
 			err($env, "git http-backend ($git_dir): $err");
 			drop_client($env);
@@ -201,7 +201,7 @@ sub serve_smart {
 		my $r = sysread($rpipe, $buf, 1024, length($buf));
 		return if !defined($r) && ($!{EINTR} || $!{EAGAIN});
 		return r(500, 'http-backend error') unless $r;
-		$r = parse_cgi_headers(\$buf) or return;
+		$r = parse_cgi_headers(\$buf) or return; # incomplete headers
 		$r->[0] == 403 ? serve_dumb($cgi, $git, $path) : $r;
 	};
 	my $res;
@@ -220,13 +220,8 @@ sub serve_smart {
 		}
 
 		# for synchronous PSGI servers
-		$r->[2] = Plack::Util::inline_object(
-			close => $end,
-			getline => sub {
-				my $ret = $buf;
-				$buf = undef;
-				defined $ret ? $ret : $rpipe->getline;
-			});
+		require PublicInbox::GetlineBody;
+		$r->[2] = PublicInbox::GetlineBody->new($rpipe, $end, $buf);
 		$res->($r);
 	};
 	sub {
-- 
cgit v1.2.3-24-ge0c7