githttpbackend: simplify compatibility code

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

diff --git a/lib/PublicInbox/GitHTTPBackend.pm b/lib/PublicInbox/GitHTTPBackend.pm
index ebb0850ad1b9b2d35896c0834ef9fdd0475d34f2..4ad3fd1ee3aca9ef0b3c44e3a9ac6598163ba825 100644 (file)
--- a/lib/PublicInbox/GitHTTPBackend.pm
+++ b/lib/PublicInbox/GitHTTPBackend.pm
@@ -7,12 +7,15 @@ 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;
 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
@@ -43,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/ ||
@@ -95,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 _;
 
@@ -193,14 +199,15 @@ sub serve_smart {
                my $val = $env->{$name};
                $env{$name} = $val if defined $val;
        }
-       my $git_dir = ref $git ? $git->{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
@@ -217,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;
@@ -248,7 +255,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...
+               $qsp->start($limiter, sub { # may run later, much later...
                        ($rpipe) = @_;
                        $in = undef;
                        if ($async) {
@@ -262,7 +269,11 @@ 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;
+       }
        my $input = $env->{'psgi.input'};
        my $buf;
        while (1) {
@@ -271,11 +282,22 @@ sub input_to_file {
                        err($env, "error reading input: $!");
                        return;
                }
-               last if ($r == 0);
-               $in->write($buf);
+               my $off = 0;
+               while ($r > 0) {
+                       my $w = syswrite($in, $buf, $r, $off);
+                       if (defined $w) {
+                               $r -= $w;
+                               $off += $w;
+                       } else {
+                               err($env, "error writing temporary file: $!");
+                               return;
+                       }
+               }
+       }
+       unless (defined(sysseek($in, 0, SEEK_SET))) {
+               err($env, "error seeking temporary file: $!");
+               return;
        }
-       $in->flush;
-       $in->sysseek(0, SEEK_SET);
        return $in;
 }