wwwstream: prioritize search in top title bar

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

diff --git a/lib/PublicInbox/GitHTTPBackend.pm b/lib/PublicInbox/GitHTTPBackend.pm
index 9660d21e77c03064407d2ada52e9bb6e34a7ef88..d4914795f3ebfbacc206466721a4e27d0a9a38f7 100644 (file)
--- a/lib/PublicInbox/GitHTTPBackend.pm
+++ b/lib/PublicInbox/GitHTTPBackend.pm
@@ -10,8 +10,12 @@ use Fcntl qw(:seek);
 use IO::File;
 use HTTP::Date qw(time2str);
 use HTTP::Status qw(status_message);
+use Plack::Util;
 use PublicInbox::Qspawn;
 
+# 32 is same as the git-daemon connection limit
+my $default_limiter = PublicInbox::Qspawn::Limiter->new(32);
+
 # n.b. serving "description" and "cloneurl" should be innocuous enough to
 # not cause problems.  serving "config" might...
 my @text = qw[HEAD info/refs
@@ -23,7 +27,7 @@ my @binary = qw!
        objects/pack/pack-[a-f0-9]{40}\.(?:pack|idx)
        !;
 
-our $ANY = join('|', @binary, @text);
+our $ANY = join('|', @binary, @text, 'git-upload-pack');
 my $BIN = join('|', @binary);
 my $TEXT = join('|', @text);
 
@@ -64,15 +68,29 @@ sub drop_client ($) {
        }
 }
 
+my $prev = 0;
+my $exp;
+sub cache_one_year {
+       my ($h) = @_;
+       my $t = time + 31536000;
+       push @$h, 'Expires', $t == $prev ? $exp : ($exp = time2str($prev = $t)),
+               'Cache-Control', 'public, max-age=31536000';
+}
+
 sub serve_dumb {
        my ($env, $git, $path) = @_;
 
        my @h;
        my $type;
-       if ($path =~ /\A(?:$BIN)\z/o) {
-               $type = 'application/octet-stream';
-               push @h, 'Expires', time2str(time + 31536000);
-               push @h, 'Cache-Control', 'public, max-age=31536000';
+       if ($path =~ m!\Aobjects/[a-f0-9]{2}/[a-f0-9]{38}\z!) {
+               $type = 'application/x-git-loose-object';
+               cache_one_year(\@h);
+       } elsif ($path =~ m!\Aobjects/pack/pack-[a-f0-9]{40}\.pack\z!) {
+               $type = 'application/x-git-packed-objects';
+               cache_one_year(\@h);
+       } elsif ($path =~ m!\Aobjects/pack/pack-[a-f0-9]{40}\.idx\z!) {
+               $type = 'application/x-git-packed-objects-toc';
+               cache_one_year(\@h);
        } elsif ($path =~ /\A(?:$TEXT)\z/o) {
                $type = 'text/plain';
                push @h, @no_cache;
@@ -80,10 +98,9 @@ sub serve_dumb {
                return r(404);
        }
 
-       my $f = "$git->{git_dir}/$path";
+       my $f = (ref $git ? $git->{git_dir} : $git) . '/' . $path;
        return r(404) unless -f $f && -r _; # just in case it's a FIFO :P
-       my @st = stat(_);
-       my $size = $st[7];
+       my $size = -s _;
 
        # TODO: If-Modified-Since and Last-Modified?
        open my $in, '<', $f or return r(404);
@@ -179,7 +196,14 @@ sub serve_smart {
                my $val = $env->{$name};
                $env{$name} = $val if defined $val;
        }
-       my $git_dir = $git->{git_dir};
+       my ($git_dir, $limiter);
+       if (ref $git) {
+               $limiter = $git->{-httpbackend_limiter} || $default_limiter;
+               $git_dir = $git->{git_dir};
+       } else {
+               $limiter = $default_limiter;
+               $git_dir = $git;
+       }
        $env{GIT_HTTP_EXPORT_ALL} = '1';
        $env{PATH_TRANSLATED} = "$git_dir/$path";
        my %rdr = ( 0 => fileno($in) );
@@ -188,7 +212,6 @@ sub serve_smart {
        my $end = sub {
                if (my $err = $x->finish) {
                        err($env, "git http-backend ($git_dir): $err");
-                       drop_client($env);
                }
                $fh->close if $fh; # async-only
        };
@@ -235,7 +258,7 @@ sub serve_smart {
                # holding the input here is a waste of FDs and memory
                $env->{'psgi.input'} = undef;
 
-               $x->start(sub { # may run later, much later...
+               $x->start($limiter, sub { # may run later, much later...
                        ($rpipe) = @_;
                        $in = undef;
                        if ($async) {