githttpbackend: simplify compatibility code

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

diff --git a/lib/PublicInbox/GitHTTPBackend.pm b/lib/PublicInbox/GitHTTPBackend.pm
index 322005b5678b035177b8f5c20b9291fb077371c5..4ad3fd1ee3aca9ef0b3c44e3a9ac6598163ba825 100644 (file)
--- a/lib/PublicInbox/GitHTTPBackend.pm
+++ b/lib/PublicInbox/GitHTTPBackend.pm
@@ -7,7 +7,7 @@ package PublicInbox::GitHTTPBackend;
 use strict;
 use warnings;
 use Fcntl qw(:seek);
-use IO::File;
+use IO::Handle;
 use HTTP::Date qw(time2str);
 use HTTP::Status qw(status_message);
 use Plack::Util;
@@ -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,21 +199,15 @@ 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) );
-       my $x = PublicInbox::Qspawn->new([qw(git http-backend)], \%env, \%rdr);
+       my $rdr = { 0 => fileno($in) };
+       my $qsp = PublicInbox::Qspawn->new([qw(git http-backend)], \%env, $rdr);
        my ($fh, $rpipe);
        my $end = sub {
-               if (my $err = $x->finish) {
+               if (my $err = $qsp->finish) {
                        err($env, "git http-backend ($git_dir): $err");
                }
                $fh->close if $fh; # async-only
@@ -227,7 +224,7 @@ sub serve_smart {
                $r->[0] == 403 ? serve_dumb($env, $git, $path) : $r;
        };
        my $res;
-       my $async = $env->{'pi-httpd.async'};
+       my $async = $env->{'pi-httpd.async'}; # XXX unstable API
        my $io = $env->{'psgix.io'};
        my $cb = sub {
                my $r = $rd_hdr->() or return;
@@ -258,7 +255,7 @@ sub serve_smart {
                # holding the input here is a waste of FDs and memory
                $env->{'psgi.input'} = undef;
 
-               $x->start($limiter, sub { # may run later, much later...
+               $qsp->start($limiter, sub { # may run later, much later...
                        ($rpipe) = @_;
                        $in = undef;
                        if ($async) {
@@ -272,7 +269,7 @@ sub serve_smart {
 
 sub input_to_file {
        my ($env) = @_;
-       my $in = IO::File->new_tmpfile;
+       open(my $in, '+>', undef);
        unless (defined $in) {
                err($env, "could not open temporary file: $!");
                return;