* [PATCH 2/4] wwwstatic: offload error handling to PSGI server
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
The PSGI server needs to account for ->getline failing
due to disk failures or truncated files, anyways. So
just die() ourselves and let the PSGI server log and
drop the client.
---
lib/PublicInbox/WwwStatic.pm | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/lib/PublicInbox/WwwStatic.pm b/lib/PublicInbox/WwwStatic.pm
index 917049bb..e1f536f3 100644
--- a/lib/PublicInbox/WwwStatic.pm
+++ b/lib/PublicInbox/WwwStatic.pm
@@ -169,16 +169,7 @@ sub getline {
return $buf;
}
my $m = defined $r ? "EOF with $len bytes left" : "read error: $!";
- my $env = $self->{env};
- $env->{'psgi.errors'}->print("$self->{path} $m\n");
-
- # drop the client on error
- if (my $io = $env->{'psgix.io'}) {
- $io->close; # this is likely PublicInbox::DS::close
- } else { # for some PSGI servers w/o psgix.io
- die "dropping client socket\n";
- }
- undef;
+ die "$self->{path} $m, dropping client socket\n";
}
sub close {} # noop, called by PSGI server, just let everything go out-of-scope
^ 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 2/4] wwwstatic: offload error handling to PSGI server 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 2/4] wwwstatic: offload error handling to PSGI server 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).