No ext_urls

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

diff --git a/lib/PublicInbox/GitHTTPBackend.pm b/lib/PublicInbox/GitHTTPBackend.pm
index 3aae54548dc990fef9e93e0e751a7fc7e782664a..744324294917df02bd07166a8d4e9423714b871d 100644 (file)
--- a/lib/PublicInbox/GitHTTPBackend.pm
+++ b/lib/PublicInbox/GitHTTPBackend.pm
@@ -23,13 +23,10 @@ my @text = qw[HEAD info/refs info/attributes
        objects/info/(?:http-alternates|alternates|packs)
        cloneurl description];
 
-my @binary = qw!
-       objects/[a-f0-9]{2}/[a-f0-9]{38}
-       objects/pack/pack-[a-f0-9]{40}\.(?:pack|idx)
-       !;
+my @binary = ('objects/[a-f0-9]{2}/[a-f0-9]{38,62}',
+       'objects/pack/pack-[a-f0-9]{40,64}\.(?:pack|idx)');
 
 our $ANY = join('|', @binary, @text, 'git-upload-pack');
-my $BIN = join('|', @binary);
 my $TEXT = join('|', @text);
 
 sub serve {
@@ -62,13 +59,13 @@ sub serve_dumb {
 
        my $h = [];
        my $type;
-       if ($path =~ m!\Aobjects/[a-f0-9]{2}/[a-f0-9]{38}\z!) {
+       if ($path =~ m!\Aobjects/[a-f0-9]{2}/[a-f0-9]{38,62}\z!) {
                $type = 'application/x-git-loose-object';
                cache_one_year($h);
-       } elsif ($path =~ m!\Aobjects/pack/pack-[a-f0-9]{40}\.pack\z!) {
+       } elsif ($path =~ m!\Aobjects/pack/pack-[a-f0-9]{40,64}\.pack\z!) {
                $type = 'application/x-git-packed-objects';
                cache_one_year($h);
-       } elsif ($path =~ m!\Aobjects/pack/pack-[a-f0-9]{40}\.idx\z!) {
+       } elsif ($path =~ m!\Aobjects/pack/pack-[a-f0-9]{40,64}\.idx\z!) {
                $type = 'application/x-git-packed-objects-toc';
                cache_one_year($h);
        } elsif ($path =~ /\A(?:$TEXT)\z/o) {
@@ -131,7 +128,7 @@ sub input_prepare {
        { 0 => $in };
 }
 
-sub parse_cgi_headers {
+sub parse_cgi_headers { # {parse_hdr} for Qspawn
        my ($r, $bref, $ctx) = @_;
        return r(500) unless defined $r && $r >= 0;
        $$bref =~ s/\A(.*?)\r?\n\r?\n//s or return $r == 0 ? r(500) : undef;
@@ -148,19 +145,17 @@ sub parse_cgi_headers {
        }
 
        # fallback to WwwCoderepo if cgit 404s.  Duplicating $ctx prevents
-       # ->finalize from the current Qspawn from using qspawn.wcb
+       # ->finalize from the current Qspawn from using qspawn.wcb.
+       # This makes qspawn skip ->async_pass and causes
+       # PublicInbox::HTTPD::Async::event_step to close shortly after
        if ($code == 404 && $ctx->{www} && !$ctx->{_coderepo_tried}++) {
-               my %ctx = %$ctx;
-               $ctx{env} = +{ %{$ctx->{env}} };
-               delete $ctx->{env}->{'qspawn.wcb'};
+               my $wcb = delete $ctx->{env}->{'qspawn.wcb'};
                $ctx->{env}->{'plack.skip-deflater'} = 1; # prevent 2x gzip
-               my $res = $ctx->{www}->coderepo->srv(\%ctx);
-               if (ref($res) eq 'CODE') {
-                       $res->(delete $ctx{env}->{'qspawn.wcb'});
-               } else { # ref($res) eq 'ARRAY'
-                       $ctx->{env}->{'qspawn.wcb'} = $ctx{env}->{'qspawn.wcb'};
-               }
-               $res; # non ARRAY ref for ->psgi_return_init_cb
+               $ctx->{env}->{'qspawn.fallback'} = $code;
+               my $res = $ctx->{www}->coderepo->srv($ctx);
+               # for ->psgi_return_init_cb
+               $ctx->{env}->{'qspawn.wcb'} = $wcb;
+               $res; # CODE or ARRAY ref
        } else {
                [ $code, \@h ]
        }