Merge remote-tracking branch 'origin/purge'

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

diff --git a/lib/PublicInbox/GitHTTPBackend.pm b/lib/PublicInbox/GitHTTPBackend.pm
index 4ad3fd1ee3aca9ef0b3c44e3a9ac6598163ba825..ab43a009eacee48f118fc680f69ed3263dc6f68d 100644 (file)
--- a/lib/PublicInbox/GitHTTPBackend.pm
+++ b/lib/PublicInbox/GitHTTPBackend.pm
@@ -1,8 +1,8 @@
-# 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
-# or smart HTTP
+# or smart HTTP.  This is our wrapper for git-http-backend(1)
 package PublicInbox::GitHTTPBackend;
 use strict;
 use warnings;
@@ -200,71 +200,15 @@ sub serve_smart {
                $env{$name} = $val if defined $val;
        }
        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";
+       $env{PATH_TRANSLATED} = "$git->{git_dir}/$path";
        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 = $qsp->finish) {
-                       err($env, "git http-backend ($git_dir): $err");
-               }
-               $fh->close if $fh; # async-only
-       };
-
-       # Danga::Socket users, we queue up the read_enable callback to
-       # fire after pending writes are complete:
-       my $buf = '';
-       my $rd_hdr = sub {
-               my $r = sysread($rpipe, $buf, 1024, length($buf));
-               return if !defined($r) && ($!{EINTR} || $!{EAGAIN});
-               return r(500, 'http-backend error') unless $r;
-               $r = parse_cgi_headers(\$buf) or return; # incomplete headers
+       $qsp->psgi_return($env, $limiter, sub {
+               my ($r, $bref) = @_;
+               $r = parse_cgi_headers($bref) or return; # incomplete headers
                $r->[0] == 403 ? serve_dumb($env, $git, $path) : $r;
-       };
-       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;
-               if (scalar(@$r) == 3) { # error:
-                       if ($async) {
-                               $async->close; # calls rpipe->close
-                       } else {
-                               $rpipe->close;
-                               $end->();
-                       }
-                       return $res->($r);
-               }
-               if ($async) {
-                       $fh = $res->($r);
-                       return $async->async_pass($io, $fh, \$buf);
-               }
-
-               # for synchronous PSGI servers
-               require PublicInbox::GetlineBody;
-               $r->[2] = PublicInbox::GetlineBody->new($rpipe, $end, $buf);
-               $res->($r);
-       };
-       sub {
-               ($res) = @_;
-
-               # hopefully this doesn't break any middlewares,
-               # holding the input here is a waste of FDs and memory
-               $env->{'psgi.input'} = undef;
-
-               $qsp->start($limiter, sub { # may run later, much later...
-                       ($rpipe) = @_;
-                       $in = undef;
-                       if ($async) {
-                               $async = $async->($rpipe, $cb, $end);
-                       } else { # generic PSGI
-                               $cb->() while $rd_hdr;
-                       }
-               });
-       };
+       });
 }
 
 sub input_to_file {
@@ -282,6 +226,7 @@ sub input_to_file {
                        err($env, "error reading input: $!");
                        return;
                }
+               last if $r == 0;
                my $off = 0;
                while ($r > 0) {
                        my $w = syswrite($in, $buf, $r, $off);