* [PATCH 1/2] git-http-backend: move real close to GetlineBody
2016-05-27 8:27 5% [PATCH 0/2] git-http-backend: more cleanups + one fix Eric Wong
@ 2016-05-27 8:27 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2016-05-27 8:27 UTC (permalink / raw)
To: meta
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);
^ permalink raw reply related [relevance 7%]
* [PATCH 0/2] git-http-backend: more cleanups + one fix
@ 2016-05-27 8:27 5% Eric Wong
2016-05-27 8:27 7% ` [PATCH 1/2] git-http-backend: move real close to GetlineBody Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2016-05-27 8:27 UTC (permalink / raw)
To: meta
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(-)
^ permalink raw reply [relevance 5%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2016-05-27 8:27 5% [PATCH 0/2] git-http-backend: more cleanups + one fix Eric Wong
2016-05-27 8:27 7% ` [PATCH 1/2] git-http-backend: move real close to GetlineBody Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).