From: Eric Wong Date: Sun, 5 Jul 2020 23:27:27 +0000 (+0000) Subject: wwwstatic: support gzipped directory listings X-Git-Tag: v1.6.0~289 X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=commitdiff_plain;h=2bb3b3491416232a44ad8b318537c856cff727f4 wwwstatic: support gzipped directory listings This will allow others to mimic our award-winning homepage design without needing to rely on Plack::Middleware::Deflater or varnish to compress responses. --- diff --git a/lib/PublicInbox/WwwStatic.pm b/lib/PublicInbox/WwwStatic.pm index 3c933156..d0611949 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 = "Index of $path_info_html" . + my $h = [qw(Content-Type text/html Content-Length), undef]; + my $gzf = gzf_maybe($h, $env) || PublicInbox::NoopFilter::new(); + $gzf->zmore("Index of $path_info_html" . ${$self->{style}} . - "
Index of $path_info_html
\n";
-	$body .= join("\n", @entries) . "
\n"; - [ 200, [ qw(Content-Type text/html - Content-Length), bytes::length($body) ], [ $body ] ] + "
Index of $path_info_html
\n");
+	$gzf->zmore(join("\n", @entries));
+	my $out = $gzf->zflush("
\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 10757cb7..364b9447 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/, 'got HTML start after gunzip'); + like($out, qr{$}, 'got HTML end after gunzip'); }); done_testing();