githttpbackend: split out wwwstatic

[public-inbox.git] / lib / PublicInbox / GitHTTPBackend.pm

diff --git a/lib/PublicInbox/GitHTTPBackend.pm b/lib/PublicInbox/GitHTTPBackend.pm
index 537a1947fc64635d827ece16f1b02887d2238b2a..b7640d42a02aecde1c3643e3be7e7177b370df7c 100644 (file)
--- a/lib/PublicInbox/GitHTTPBackend.pm
+++ b/lib/PublicInbox/GitHTTPBackend.pm
@@ -10,9 +10,9 @@ use Fcntl qw(:seek);
 use IO::Handle;
 use HTTP::Date qw(time2str);
 use HTTP::Status qw(status_message);
-use Plack::Util;
 use PublicInbox::Qspawn;
 use PublicInbox::Tmpfile;
+use PublicInbox::WwwStatic;
 
 # 32 is same as the git-daemon connection limit
 my $default_limiter = PublicInbox::Qspawn::Limiter->new(32);
@@ -66,12 +66,6 @@ sub err ($@) {
        $env->{'psgi.errors'}->print(@msg, "\n");
 }
 
-sub drop_client ($) {
-       if (my $io = $_[0]->{'psgix.io'}) {
-               $io->close; # this is PublicInbox::DS::close
-       }
-}
-
 my $prev = 0;
 my $exp;
 sub cache_one_year {
@@ -81,44 +75,6 @@ sub cache_one_year {
                'Cache-Control', 'public, max-age=31536000';
 }
 
-sub static_result ($$$$) {
-       my ($env, $h, $f, $type) = @_;
-       return r(404) unless -f $f && -r _; # just in case it's a FIFO :P
-
-       # TODO: If-Modified-Since and Last-Modified?
-       open my $in, '<', $f or return r(404);
-       my $size = -s $in;
-       my $len = $size;
-       my $code = 200;
-       push @$h, 'Content-Type', $type;
-       if (($env->{HTTP_RANGE} || '') =~ /\bbytes=([0-9]*)-([0-9]*)\z/) {
-               ($code, $len) = prepare_range($env, $in, $h, $1, $2, $size);
-               if ($code == 416) {
-                       push @$h, 'Content-Range', "bytes */$size";
-                       return [ 416, $h, [] ];
-               }
-       }
-       push @$h, 'Content-Length', $len;
-       my $n = 65536;
-       [ $code, $h, Plack::Util::inline_object(close => sub { close $in },
-               getline => sub {
-                       return if $len == 0;
-                       $n = $len if $len < $n;
-                       my $r = sysread($in, my $buf, $n);
-                       if (!defined $r) {
-                               err($env, "$f read error: $!");
-                       } elsif ($r <= 0) {
-                               err($env, "$f EOF with $len bytes left");
-                       } else {
-                               $len -= $r;
-                               $n = 8192;
-                               return $buf;
-                       }
-                       drop_client($env);
-                       return;
-               })]
-}
-
 sub serve_dumb {
        my ($env, $git, $path) = @_;
 
@@ -139,49 +95,8 @@ sub serve_dumb {
        } else {
                return r(404);
        }
-
-       static_result($env, $h, "$git->{git_dir}/$path", $type);
-}
-
-sub prepare_range {
-       my ($env, $in, $h, $beg, $end, $size) = @_;
-       my $code = 200;
-       my $len = $size;
-       if ($beg eq '') {
-               if ($end ne '') { # "bytes=-$end" => last N bytes
-                       $beg = $size - $end;
-                       $beg = 0 if $beg < 0;
-                       $end = $size - 1;
-                       $code = 206;
-               } else {
-                       $code = 416;
-               }
-       } else {
-               if ($beg > $size) {
-                       $code = 416;
-               } elsif ($end eq '' || $end >= $size) {
-                       $end = $size - 1;
-                       $code = 206;
-               } elsif ($end < $size) {
-                       $code = 206;
-               } else {
-                       $code = 416;
-               }
-       }
-       if ($code == 206) {
-               $len = $end - $beg + 1;
-               if ($len <= 0) {
-                       $code = 416;
-               } else {
-                       sysseek($in, $beg, SEEK_SET) or return [ 500, [], [] ];
-                       push @$h, qw(Accept-Ranges bytes Content-Range);
-                       push @$h, "bytes $beg-$end/$size";
-
-                       # FIXME: Plack::Middleware::Deflater bug?
-                       $env->{'psgix.no-compress'} = 1;
-               }
-       }
-       ($code, $len);
+       $path = "$git->{git_dir}/$path";
+       PublicInbox::WwwStatic::response($env, $h, $path, $type) // r(404);
 }
 
 sub git_parse_hdr { # {parse_hdr} for Qspawn