* [PATCH 1/4] http: eliminate short-lived cyclic ref for psgix.io
2020-01-24 9:43 6% [PATCH 0/4] -httpd static file improvements Eric Wong
@ 2020-01-24 9:43 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2020-01-24 9:43 UTC (permalink / raw)
To: meta
While there is no known actual leak due to reference cycles,
here, eliminating a potential source of leaks is helpful.
---
Just a minor cleanup I noticed along the way.
lib/PublicInbox/HTTP.pm | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/lib/PublicInbox/HTTP.pm b/lib/PublicInbox/HTTP.pm
index 32537153..b19a15d6 100644
--- a/lib/PublicInbox/HTTP.pm
+++ b/lib/PublicInbox/HTTP.pm
@@ -80,7 +80,7 @@ sub event_step { # called by PublicInbox::DS
# only read more requests if we've drained the write buffer,
# otherwise we can be buffering infinitely w/o backpressure
- return read_input($self) if defined $self->{env};
+ return read_input($self) if ref($self->{env});
my $rbuf = $self->{rbuf} // (\(my $x = ''));
$self->do_read($rbuf, 8192, bytes::length($$rbuf)) or return;
rbuf_process($self, $rbuf);
@@ -124,7 +124,6 @@ sub read_input ($;$) {
my ($self, $rbuf) = @_;
$rbuf //= $self->{rbuf} // (\(my $x = ''));
my $env = $self->{env};
- return if $env->{REMOTE_ADDR}; # in app dispatch
return read_input_chunked($self, $rbuf) if env_chunked($env);
# env->{CONTENT_LENGTH} (identity)
@@ -153,6 +152,7 @@ sub app_dispatch {
my ($self, $input, $rbuf) = @_;
$self->rbuf_idle($rbuf);
my $env = $self->{env};
+ $self->{env} = undef; # for exists() check in ->busy
$env->{REMOTE_ADDR} = $self->{remote_addr};
$env->{REMOTE_PORT} = $self->{remote_port};
if (defined(my $host = $env->{HTTP_HOST})) {
@@ -455,7 +455,6 @@ sub quit {
sub close {
my $self = $_[0];
- delete $self->{env}; # prevent circular references
if (my $forward = delete $self->{forward}) {
eval { $forward->close };
err($self, "forward ->close error: $@") if $@;
@@ -466,7 +465,7 @@ sub close {
# for graceful shutdown in PublicInbox::Daemon:
sub busy () {
my ($self) = @_;
- ($self->{rbuf} || $self->{env} || $self->{wbuf});
+ ($self->{rbuf} || exists($self->{env}) || $self->{wbuf});
}
# Chunked and Identity packages are used for writing responses.
^ permalink raw reply related [relevance 7%]
* [PATCH 0/4] -httpd static file improvements
@ 2020-01-24 9:43 6% Eric Wong
2020-01-24 9:43 7% ` [PATCH 1/4] http: eliminate short-lived cyclic ref for psgix.io Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2020-01-24 9:43 UTC (permalink / raw)
To: meta
Serving large static files to slow clients could lead to
public-inbox-httpd buffering data already in static files again
into a temporary file.
This was inefficient, and solving it in a generic way could
actually break other PSGI servers since their sendfile
optimizations don't handle 206 (partial content) responses
correctly.
So we make minor changes to the way PublicInbox::DS handles
write buffers and inject static files, offsets, and length
limits directly into the {wbuf} queue.
Eric Wong (4):
http: eliminate short-lived cyclic ref for psgix.io
wwwstatic: offload error handling to PSGI server
ds: tmpio: store offsets per-buffer
wwwstatic: wire up buffer bypass for -httpd
lib/PublicInbox/DS.pm | 36 ++++++++++----------
lib/PublicInbox/HTTP.pm | 7 ++--
lib/PublicInbox/WwwStatic.pm | 65 +++++++++++++++++++++---------------
3 files changed, 61 insertions(+), 47 deletions(-)
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2020-01-24 9:43 6% [PATCH 0/4] -httpd static file improvements Eric Wong
2020-01-24 9:43 7% ` [PATCH 1/4] http: eliminate short-lived cyclic ref for psgix.io 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).