1 files changed, 16 insertions, 19 deletions
diff --git a/lib/PublicInbox/WwwStatic.pm b/lib/PublicInbox/WwwStatic.pm
index eeb5e565..d8902193 100644
--- a/lib/PublicInbox/WwwStatic.pm
+++ b/lib/PublicInbox/WwwStatic.pm
@@ -12,13 +12,12 @@ use strict;
  use v5.10.1;
  use parent qw(Exporter);
  use Fcntl qw(SEEK_SET O_RDONLY O_NONBLOCK);
-use POSIX qw(strftime);
  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::GzipFilter qw(gzf_maybe);
-use PublicInbox::Hval qw(ascii_html);
+use PublicInbox::Hval qw(ascii_html fmt_ts);
  use Plack::MIME;
  our @EXPORT_OK = qw(@NO_CACHE r path_info_raw);
  
@@ -275,12 +274,11 @@ sub dir_response ($$$) {
          my $path_info = $env->{PATH_INFO};
          push @entries, '..' if $path_info ne '/';
          for my $base (@entries) {
+                my @st = stat($fs_path . $base) or next; # unlikely
                  my $href = ascii_html(uri_escape_utf8($base));
                  my $name = ascii_html($base);
-                my @st = stat($fs_path . $base) or next; # unlikely
-                my ($gzipped, $uncompressed, $hsize);
-                my $entry = '';
                  my $mtime = $st[9];
+                my ($entry, $hsize);
                  if (-d _) {
                          $href .= '/';
                          $name .= '/';
@@ -296,12 +294,12 @@ sub dir_response ($$$) {
                          next;
                  }
                  # 54 = 80 - (SP length(strftime(%Y-%m-%d %k:%M)) SP human_size)
-                $hsize = sprintf('% 8s', $hsize);
                  my $pad = 54 - length($name);
                  $pad = 1 if $pad <= 0;
-                $entry .= qq(<a\nhref="$href">$name</a>) . (' ' x $pad);
-                $mtime = strftime('%Y-%m-%d %k:%M', gmtime($mtime));
-                $entry .= $mtime . $hsize;
+                $entry = qq(\n<a\nhref="$href">$name</a>) .
+                                (' ' x $pad) .
+                                fmt_ts($mtime) .
+                                sprintf('% 8s', $hsize);
          }
  
          # filter out '.gz' files as long as the mtime matches the
@@ -309,17 +307,16 @@ sub dir_response ($$$) {
          delete(@other{keys %want_gz});
          @entries = ((map { ${$dirs{$_}} } sort keys %dirs),
                          (map { ${$other{$_}} } sort keys %other));
-
          my $path_info_html = ascii_html($path_info);
-        my $h = [qw(Content-Type text/html Content-Length), undef];
-        my $gzf = gzf_maybe($h, $env);
-        $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");
-        $gzf->zmore(join("\n", @entries));
-        my $out = $gzf->zflush("</pre><hr></body></html>\n");
-        $h->[3] = length($out);
-        [ 200, $h, [ $out ] ]
+        my @h = qw(Content-Type text/html);
+        my $gzf = gzf_maybe(\@h, $env);
+        print { $gzf->zfh } '<html><head><title>Index of ', $path_info_html,
+                '</title>', ${$self->{style}}, '</head><body><pre>Index of ',
+                $path_info_html, '</pre><hr><pre>', @entries,
+                '</pre><hr></body></html>';
+        my $out = $gzf->zflush;
+        push @h, 'Content-Length', length($out);
+        [ 200, \@h, [ $out ] ]
  }
  
  sub call { # PSGI app endpoint