* [PATCH 13/43] stop auto-loading Plack::Middleware::Deflater
2020-07-05 23:27 7% [PATCH 00/43] www: async git cat-file w/ -httpd Eric Wong
@ 2020-07-05 23:27 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2020-07-05 23:27 UTC (permalink / raw)
To: meta
Instead of gzipping some (mbox.gz, manifest.js.gz) responses and
leaving P::M::D to do the rest, we gzip everything ourselves,
now, so P::M::D is redundant.
---
Documentation/public-inbox-httpd.pod | 1 -
INSTALL | 5 -----
ci/deps.perl | 1 -
examples/cgit.psgi | 8 --------
examples/newswww.psgi | 8 --------
examples/public-inbox.psgi | 9 ---------
examples/unsubscribe.psgi | 1 -
script/public-inbox-httpd | 9 ---------
script/public-inbox.cgi | 7 -------
9 files changed, 49 deletions(-)
diff --git a/Documentation/public-inbox-httpd.pod b/Documentation/public-inbox-httpd.pod
index c1ebfd822..2f4e9e5d1 100644
--- a/Documentation/public-inbox-httpd.pod
+++ b/Documentation/public-inbox-httpd.pod
@@ -15,7 +15,6 @@ the PSGI file.
If a PSGI file is not specified, L<PublicInbox::WWW> is
loaded with a default middleware stack consisting of
-L<Plack::Middleware::Deflater>,
L<Plack::Middleware::ReverseProxy>, and
L<Plack::Middleware::Head>
diff --git a/INSTALL b/INSTALL
index 05e0f95e9..9f05c3f62 100644
--- a/INSTALL
+++ b/INSTALL
@@ -100,11 +100,6 @@ Numerous optional modules are likely to be useful as well:
(ensures redirects are correct when running
behind nginx or Varnish)
-- Plack::Middleware::Deflater deb: libplack-middleware-deflater-perl
- pkg: p5 -Plack-Middleware-Deflater
- rpm: perl-Plack-Middleware-Deflater
- (saves bandwidth on responses)
-
* highlight deb: libhighlight-perl
(for syntax highlighting with coderepo)
diff --git a/ci/deps.perl b/ci/deps.perl
index 501f51129..77d95fc8e 100755
--- a/ci/deps.perl
+++ b/ci/deps.perl
@@ -36,7 +36,6 @@ my $profiles = {
Net::Server
Plack
Plack::Test
- Plack::Middleware::Deflater
Plack::Middleware::ReverseProxy
Search::Xapian
Socket6
diff --git a/examples/cgit.psgi b/examples/cgit.psgi
index e72e832d0..7ad38e280 100644
--- a/examples/cgit.psgi
+++ b/examples/cgit.psgi
@@ -18,14 +18,6 @@ my $pi_config = PublicInbox::Config->new;
my $cgit = PublicInbox::Cgit->new($pi_config);
builder {
- eval {
- enable 'Deflater',
- content_type => [ qw(
- text/html
- text/plain
- application/atom+xml
- )]
- };
eval { enable 'ReverseProxy' };
enable 'Head';
sub { $cgit->call($_[0]) }
diff --git a/examples/newswww.psgi b/examples/newswww.psgi
index 3cce7191d..52ad7043e 100644
--- a/examples/newswww.psgi
+++ b/examples/newswww.psgi
@@ -36,14 +36,6 @@ builder {
# regular PublicInbox::WWW code:
# see comments in examples/public-inbox.psgi for more info:
mount '/' => builder {
- eval {
- enable 'Deflater',
- content_type => [ qw(
- text/html
- text/plain
- application/atom+xml
- )]
- };
eval { enable 'ReverseProxy' };
enable 'Head';
sub { $www->call($_[0]) }
diff --git a/examples/public-inbox.psgi b/examples/public-inbox.psgi
index 9891a1f03..3537be2c7 100644
--- a/examples/public-inbox.psgi
+++ b/examples/public-inbox.psgi
@@ -22,15 +22,6 @@ my $src = $ENV{SRC_GIT_DIR}; # '/path/to/public-inbox.git'
$src = PublicInbox::Git->new($src) if defined $src;
builder {
- eval {
- enable 'Deflater',
- content_type => [ qw(
- text/html
- text/plain
- application/atom+xml
- )]
- };
-
# Enable to ensure redirects and Atom feed URLs are generated
# properly when running behind a reverse proxy server which
# sets the X-Forwarded-Proto request header.
diff --git a/examples/unsubscribe.psgi b/examples/unsubscribe.psgi
index 6a40f251d..7b97e2532 100644
--- a/examples/unsubscribe.psgi
+++ b/examples/unsubscribe.psgi
@@ -61,7 +61,6 @@ my $app = PublicInbox::Unsubscribe->new(
builder {
mount '/u' => builder {
- eval { enable 'Deflater' }; # optional
eval { enable 'ReverseProxy' }; # optional
enable 'Head';
sub { $app->call(@_) };
diff --git a/script/public-inbox-httpd b/script/public-inbox-httpd
index 09da505e5..b8159f3a5 100755
--- a/script/public-inbox-httpd
+++ b/script/public-inbox-httpd
@@ -27,15 +27,6 @@ my $refresh = sub {
my $www = PublicInbox::WWW->new;
$www->preload;
$app = builder {
- eval {
- enable 'Deflater',
- content_type => [ qw(
- text/html
- text/plain
- application/atom+xml
- )]
- };
-
eval { enable 'ReverseProxy' };
$@ and warn
"Plack::Middleware::ReverseProxy missing,\n",
diff --git a/script/public-inbox.cgi b/script/public-inbox.cgi
index c766483a2..42ab17c9e 100755
--- a/script/public-inbox.cgi
+++ b/script/public-inbox.cgi
@@ -13,14 +13,7 @@ BEGIN {
PublicInbox::WWW->preload if $ENV{MOD_PERL};
}
my $www = PublicInbox::WWW->new;
-my $have_deflater = eval { require Plack::Middleware::Deflater; 1 };
my $app = builder {
- if ($have_deflater) {
- enable 'Deflater',
- content_type => [ 'text/html', 'text/plain',
- 'application/atom+xml' ];
- }
-
# Enable to ensure redirects and Atom feed URLs are generated
# properly when running behind a reverse proxy server which
# sets the X-Forwarded-Proto request header.
^ permalink raw reply related [relevance 7%]
* [PATCH 00/43] www: async git cat-file w/ -httpd
@ 2020-07-05 23:27 7% Eric Wong
2020-07-05 23:27 7% ` [PATCH 13/43] stop auto-loading Plack::Middleware::Deflater Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2020-07-05 23:27 UTC (permalink / raw)
To: meta
This allows -httpd to make better use of time it spends waiting
on git-cat-file to respond. It allows us to deal with
high-latency HDD storage without a client monopolizing the event
loop. Even on a mid-range consumer-grade SSD, this seems to
give a 10+% speed improvement for HTTP responses requiring many
blobs, including all /T/, /t/, and /t.mbox.gz endpoints.
This only benefits indexed inboxes (both v1 and v2); I'm not
sure if anybody still uses unindexed v1 inboxes nowadays.
A new xt/httpd-async-stream.t maintainer test ensures checksums
for responses before and after this series match exactly as
before.
This builds off a branch I started several months ago (but never
published here) to integrate gzip responses into our codebase
and remove our optional dependency on Plack::Middleware::Deflater.
We already gzip a bunch of things independent of
Plack::Middleware::Deflater: manifest.js.gz, altid SQLite3 dumps
and all the *.mbox.gz endpoints; so being able to use gzip on
all of our responses without an extra dependency seemed logical.
Being able to consistently use our GzipFilter API to perform
buffering via ->zmore made it significantly easier to reason
about small response chunks for ghost messages interspersed with
large ones when streaming /$INBOX/$MSGID/t/ endpoints.
I'm not yet maximizing use of ->zmore for all buffering of HTTP
responses, yet; measurements need to happen, first. That may
happen in the 1.7 time frame. In particular, we would need to
ensure the Perl method dispatch and DSO overhead to Zlib.so and
libz.so of making many ->zmore calls doesn't cause performance
regressions compared to the current `.=' use and calling
->zmore/->translate fewer times.
Eric Wong (43):
gzipfilter: minor cleanups
wwwstream: oneshot: perform gzip without middleware
www*stream: gzip ->getline responses
wwwtext: gzip text/plain responses, as well
wwwtext: switch to html_oneshot
www: need: use WwwStream::html_oneshot
wwwlisting: use GzipFilter for HTML
gzipfilter: replace Compress::Raw::Deflate usages
{gzip,noop}filter: ->zmore returns undef, always
mbox: remove html_oneshot import
wwwstatic: support gzipped response directory listings
qspawn: learn to gzip streaming responses
stop auto-loading Plack::Middleware::Deflater
mboxgz: do asynchronous git blob retrievals
mboxgz: reduce object hash depth
mbox: async blob retrieval for "single message" raw mboxrd
wwwatomstream: simplify feed_update callers
wwwatomstream: use PublicInbox::Inbox->modified for feed_updated
wwwatomstream: reuse $ctx as $self
xt/httpd-async-stream: allow more options
wwwatomstream: support asynchronous blob retrievals
wwwstream: reduce object graph depth
wwwstream: reduce blob retrieval paths for ->getline
www: start making gzipfilter the parent response class
remove unused/redundant zlib-related imports
wwwstream: use parent.pm and no warnings
wwwstream: subclass off GzipFilter
view: wire up /$INBOX/$MESSAGE_ID/ permalink to async
view: /$INBOX/$MSGID/t/ reads blobs asynchronously
view: update /$INBOX/$MSGID/T/ to be async
feed: generate_i: eliminate pointless loop
feed: /$INBOX/new.html retrieves blobs asynchronously
ssearchview: /$INBOX/?q=$QUERY&x=t uses async blobs
view: eml_entry: reduce parameters
view: /$INBOX/$MSGID/t/: avoid extra hash lookup in eml case
wwwstream: eliminate ::response, use html_oneshot
www: update internal docs
view: simplify eml_entry callers further
wwwtext: simplify gzf_maybe use
wwwattach: support async blob retrievals
gzipfilter: drop HTTP connection on bugs or data corruption
daemon: warn on missing blobs
gzipfilter: check http->{forward} for client disconnects
Documentation/mknews.perl | 20 +--
Documentation/public-inbox-httpd.pod | 1 -
Documentation/technical/ds.txt | 4 +-
INSTALL | 5 -
MANIFEST | 2 +
ci/deps.perl | 1 -
examples/cgit.psgi | 8 -
examples/newswww.psgi | 8 -
examples/public-inbox.psgi | 9 --
examples/unsubscribe.psgi | 1 -
lib/PublicInbox/CompressNoop.pm | 22 +++
lib/PublicInbox/Feed.pm | 22 ++-
lib/PublicInbox/GetlineBody.pm | 4 +-
lib/PublicInbox/GzipFilter.pm | 168 +++++++++++++++++---
lib/PublicInbox/HTTP.pm | 7 +
lib/PublicInbox/HTTPD.pm | 5 +-
lib/PublicInbox/IMAP.pm | 1 +
lib/PublicInbox/Mbox.pm | 137 +++++++++--------
lib/PublicInbox/MboxGz.pm | 81 ++++------
lib/PublicInbox/NNTP.pm | 1 +
lib/PublicInbox/Qspawn.pm | 6 +-
lib/PublicInbox/SearchView.pm | 40 ++---
lib/PublicInbox/View.pm | 219 ++++++++++++++-------------
lib/PublicInbox/WWW.pm | 9 +-
lib/PublicInbox/WwwAtomStream.pm | 66 ++++----
lib/PublicInbox/WwwAttach.pm | 63 ++++++--
lib/PublicInbox/WwwListing.pm | 24 +--
lib/PublicInbox/WwwStatic.pm | 14 +-
lib/PublicInbox/WwwStream.pm | 110 ++++++++------
lib/PublicInbox/WwwText.pm | 26 ++--
script/public-inbox-httpd | 9 --
script/public-inbox.cgi | 7 -
t/httpd-corner.psgi | 7 +
t/httpd-corner.t | 9 +-
t/plack.t | 4 +
t/psgi_attach.t | 162 +++++++++++---------
t/psgi_text.t | 33 +++-
t/psgi_v2.t | 80 ++++++++--
t/www_listing.t | 8 +-
t/www_static.t | 11 +-
xt/httpd-async-stream.t | 104 +++++++++++++
41 files changed, 964 insertions(+), 554 deletions(-)
create mode 100644 lib/PublicInbox/CompressNoop.pm
create mode 100644 xt/httpd-async-stream.t
^ permalink raw reply [relevance 7%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2020-07-05 23:27 7% [PATCH 00/43] www: async git cat-file w/ -httpd Eric Wong
2020-07-05 23:27 7% ` [PATCH 13/43] stop auto-loading Plack::Middleware::Deflater 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).