]> Sergey Matveev's repositories - public-inbox.git/commitdiff
wwwstatic: support gzipped directory listings
authorEric Wong <e@yhbt.net>
Sun, 5 Jul 2020 23:27:27 +0000 (23:27 +0000)
committerEric Wong <e@yhbt.net>
Mon, 6 Jul 2020 20:01:15 +0000 (20:01 +0000)
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
t/www_static.t

index 3c933156405bedb92db5afee4a3beed6a29506bc..d0611949d29bb35bc3c819ee7459ac72bb0ab6ba 100644 (file)
@@ -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
index 10757cb7feb3833d89f40c1e8f7e9d11252a2126..364b9447a0205c7192e5bd0112f366583d50e38c 100644 (file)
@@ -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();