* [PATCH 11/43] wwwstatic: support gzipped directory listings
@ 2020-07-05 23:27 7% ` Eric Wong
0 siblings, 0 replies; 1+ results
From: Eric Wong @ 2020-07-05 23:27 UTC (permalink / raw)
To: meta
This will allow others to mimic our award-winning homepage
design without needing to rely on Plack::Middleware::Deflater
or varnish to compress responses.
---
lib/PublicInbox/WwwStatic.pm | 15 ++++++++++-----
t/www_static.t | 11 ++++++++++-
2 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/lib/PublicInbox/WwwStatic.pm b/lib/PublicInbox/WwwStatic.pm
index 3c9331564..d0611949d 100644
--- a/lib/PublicInbox/WwwStatic.pm
+++ b/lib/PublicInbox/WwwStatic.pm
@@ -17,6 +17,8 @@ use HTTP::Date qw(time2str);
use HTTP::Status qw(status_message);
use Errno qw(EACCES ENOTDIR ENOENT);
use URI::Escape qw(uri_escape_utf8);
+use PublicInbox::NoopFilter;
+use PublicInbox::GzipFilter qw(gzf_maybe);
use PublicInbox::Hval qw(ascii_html);
use Plack::MIME;
our @EXPORT_OK = qw(@NO_CACHE r path_info_raw);
@@ -310,12 +312,15 @@ sub dir_response ($$$) {
(map { ${$other{$_}} } sort keys %other));
my $path_info_html = ascii_html($path_info);
- my $body = "<html><head><title>Index of $path_info_html</title>" .
+ my $h = [qw(Content-Type text/html Content-Length), undef];
+ my $gzf = gzf_maybe($h, $env) || PublicInbox::NoopFilter::new();
+ $gzf->zmore("<html><head><title>Index of $path_info_html</title>" .
${$self->{style}} .
- "</head><body><pre>Index of $path_info_html</pre><hr><pre>\n";
- $body .= join("\n", @entries) . "</pre><hr></body></html>\n";
- [ 200, [ qw(Content-Type text/html
- Content-Length), bytes::length($body) ], [ $body ] ]
+ "</head><body><pre>Index of $path_info_html</pre><hr><pre>\n");
+ $gzf->zmore(join("\n", @entries));
+ my $out = $gzf->zflush("</pre><hr></body></html>\n");
+ $h->[3] = bytes::length($out);
+ [ 200, $h, [ $out ] ]
}
sub call { # PSGI app endpoint
diff --git a/t/www_static.t b/t/www_static.t
index 10757cb7f..364b9447a 100644
--- a/t/www_static.t
+++ b/t/www_static.t
@@ -6,7 +6,7 @@ use Test::More;
use PublicInbox::TestCommon;
my ($tmpdir, $for_destroy) = tmpdir();
my @mods = qw(HTTP::Request::Common Plack::Test URI::Escape);
-require_mods(@mods);
+require_mods(@mods, 'IO::Uncompress::Gunzip');
use_ok $_ foreach @mods;
use_ok 'PublicInbox::WwwStatic';
@@ -91,6 +91,15 @@ test_psgi($app->(autoindex => 1, index => []), sub {
$get->header('Accept-Encoding' => 'gzip');
$res = $cb->($get);
is($res->content, "hi", 'got compressed on mtime match');
+
+ $get = GET('/dir/');
+ $get->header('Accept-Encoding' => 'gzip');
+ $res = $cb->($get);
+ my $in = $res->content;
+ my $out = '';
+ IO::Uncompress::Gunzip::gunzip(\$in => \$out);
+ like($out, qr/\A<html>/, 'got HTML start after gunzip');
+ like($out, qr{</html>$}, 'got HTML end after gunzip');
});
done_testing();
^ permalink raw reply related [relevance 7%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2020-07-05 23:27 [PATCH 00/43] www: async git cat-file w/ -httpd Eric Wong
2020-07-05 23:27 7% ` [PATCH 11/43] wwwstatic: support gzipped directory listings 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).