update copyrights for 2018

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

diff --git a/lib/PublicInbox/GitHTTPBackend.pm b/lib/PublicInbox/GitHTTPBackend.pm
index 86b8ebccf03fb4b4521bd2ce840b0fc93ed5088e..4d2816a00c4b92b8a9b562906b9d944f567eadaa 100644 (file)
--- a/lib/PublicInbox/GitHTTPBackend.pm
+++ b/lib/PublicInbox/GitHTTPBackend.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2018 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # when no endpoints match, fallback to this and serve a static file
@@ -46,6 +46,9 @@ sub r ($;$) {
 sub serve {
        my ($env, $git, $path) = @_;
 
+       # XXX compatibility... ugh, can we stop supporting this?
+       $git = PublicInbox::Git->new($git) unless ref($git);
+
        # Documentation/technical/http-protocol.txt in git.git
        # requires one and exactly one query parameter:
        if ($env->{QUERY_STRING} =~ /\Aservice=git-\w+-pack\z/ ||
@@ -98,7 +101,7 @@ sub serve_dumb {
                return r(404);
        }
 
-       my $f = (ref $git ? $git->{git_dir} : $git) . '/' . $path;
+       my $f = $git->{git_dir} . '/' . $path;
        return r(404) unless -f $f && -r _; # just in case it's a FIFO :P
        my $size = -s _;
 
@@ -196,14 +199,8 @@ sub serve_smart {
                my $val = $env->{$name};
                $env{$name} = $val if defined $val;
        }
-       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;
-       }
+       my $limiter = $git->{-httpbackend_limiter} || $default_limiter;
+       my $git_dir = $git->{git_dir};
        $env{GIT_HTTP_EXPORT_ALL} = '1';
        $env{PATH_TRANSLATED} = "$git_dir/$path";
        my $rdr = { 0 => fileno($in) };
@@ -228,7 +225,6 @@ sub serve_smart {
        };
        my $res;
        my $async = $env->{'pi-httpd.async'}; # XXX unstable API
-       my $io = $env->{'psgix.io'};
        my $cb = sub {
                my $r = $rd_hdr->() or return;
                $rd_hdr = undef;
@@ -239,17 +235,16 @@ sub serve_smart {
                                $rpipe->close;
                                $end->();
                        }
-                       return $res->($r);
-               }
-               if ($async) {
+                       $res->($r);
+               } elsif ($async) {
                        $fh = $res->($r);
-                       return $async->async_pass($io, $fh, \$buf);
+                       $async->async_pass($env->{'psgix.io'}, $fh, \$buf);
+               } else { # for synchronous PSGI servers
+                       require PublicInbox::GetlineBody;
+                       $r->[2] = PublicInbox::GetlineBody->new($rpipe, $end,
+                                                               $buf);
+                       $res->($r);
                }
-
-               # for synchronous PSGI servers
-               require PublicInbox::GetlineBody;
-               $r->[2] = PublicInbox::GetlineBody->new($rpipe, $end, $buf);
-               $res->($r);
        };
        sub {
                ($res) = @_;