* [PATCH 0/3] http: another round EPIPE fixes
@ 2016-05-27 6:17 6% Eric Wong
2016-05-27 6:17 7% ` [PATCH 2/3] http: avoid circular reference for getline responses Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2016-05-27 6:17 UTC (permalink / raw)
To: meta
Hopefully this is end of resource leaks on prematurely aborted
client connections.
Eric Wong (3):
httpd/async: prevent circular reference
http: avoid circular reference for getline responses
git-http-backend: fix aborts for generic PSGI clone
lib/PublicInbox/GetlineBody.pm | 31 +++++++++++++++++++++++++++
lib/PublicInbox/GitHTTPBackend.pm | 13 ++++-------
lib/PublicInbox/HTTP.pm | 45 ++++++++++++++++++++++++---------------
lib/PublicInbox/HTTPD/Async.pm | 4 +++-
4 files changed, 66 insertions(+), 27 deletions(-)
^ permalink raw reply [relevance 6%]
* [PATCH 2/3] http: avoid circular reference for getline responses
2016-05-27 6:17 6% [PATCH 0/3] http: another round EPIPE fixes Eric Wong
@ 2016-05-27 6:17 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2016-05-27 6:17 UTC (permalink / raw)
To: meta
Lightly tested, this seems to work when mass-aborting
responses. Will still need to automate the testing...
---
lib/PublicInbox/HTTP.pm | 45 ++++++++++++++++++++++++++++-----------------
1 file changed, 28 insertions(+), 17 deletions(-)
diff --git a/lib/PublicInbox/HTTP.pm b/lib/PublicInbox/HTTP.pm
index 6aae5c8..0454f60 100644
--- a/lib/PublicInbox/HTTP.pm
+++ b/lib/PublicInbox/HTTP.pm
@@ -11,11 +11,12 @@ package PublicInbox::HTTP;
use strict;
use warnings;
use base qw(Danga::Socket);
-use fields qw(httpd env rbuf input_left remote_addr remote_port forward);
+use fields qw(httpd env rbuf input_left remote_addr remote_port forward pull);
use Fcntl qw(:seek);
use Plack::HTTPParser qw(parse_http_request); # XS or pure Perl
use HTTP::Status qw(status_message);
use HTTP::Date qw(time2str);
+use Scalar::Util qw(weaken);
use IO::File;
use constant {
CHUNK_START => -1, # [a-f0-9]+\r\n
@@ -255,6 +256,28 @@ sub response_done ($$) {
}
}
+sub getline_response {
+ my ($self, $body, $write, $close) = @_;
+ $self->{forward} = $body;
+ weaken($self);
+ my $pull = $self->{pull} = sub {
+ local $/ = \8192;
+ my $forward = $self->{forward};
+ while ($forward && defined(my $buf = $forward->getline)) {
+ $write->($buf);
+ last if $self->{closed};
+ if ($self->{write_buf_size}) {
+ $self->write($self->{pull});
+ return;
+ }
+ }
+ $self->{forward} = $self->{pull} = undef;
+ $forward->close if $forward; # avoid recursion
+ $close->();
+ };
+ $pull->();
+}
+
sub response_write {
my ($self, $env, $res) = @_;
my $alive = response_header_write($self, $env, $res);
@@ -266,21 +289,7 @@ sub response_write {
$write->($_) foreach @$body;
$close->();
} else {
- my $pull;
- $pull = sub {
- local $/ = \8192;
- while (defined(my $buf = $body->getline)) {
- $write->($buf);
- if ($self->{write_buf_size}) {
- $self->write($pull);
- return;
- }
- }
- $pull = undef;
- $body->close();
- $close->();
- };
- $pull->();
+ getline_response($self, $body, $write, $close);
}
} else {
# this is returned to the calling application:
@@ -445,8 +454,10 @@ sub event_err { $_[0]->close }
sub close {
my $self = shift;
my $forward = $self->{forward};
+ my $env = $self->{env};
+ delete $env->{'psgix.io'} if $env; # prevent circular referernces
+ $self->{pull} = $self->{forward} = $self->{env} = undef;
$forward->close if $forward;
- $self->{forward} = $self->{env} = undef;
$self->SUPER::close(@_);
}
^ permalink raw reply related [relevance 7%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2016-05-27 6:17 6% [PATCH 0/3] http: another round EPIPE fixes Eric Wong
2016-05-27 6:17 7% ` [PATCH 2/3] http: avoid circular reference for getline responses 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).