git-http-backend: extract input_to_file function

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

diff --git a/lib/PublicInbox/GitHTTPBackend.pm b/lib/PublicInbox/GitHTTPBackend.pm
index 3cf78579ba80d59ad273444d98b5747bae708d69..f8446aa0d16151fc120ff42332e21cbb07e385f3 100644 (file)
--- a/lib/PublicInbox/GitHTTPBackend.pm
+++ b/lib/PublicInbox/GitHTTPBackend.pm
@@ -135,29 +135,19 @@ sub serve_smart {
        if (fileno($input) >= 0) {
                $in = $input;
        } else { # FIXME untested
-               $in = IO::File->new_tmpfile;
-               while (1) {
-                       my $r = $input->read($buf, 8192);
-                       unless (defined $r) {
-                               $err->print('error reading input: ', $!, "\n");
-                               return r(500);
-                       }
-                       last if ($r == 0);
-                       $in->write($buf);
-               }
-               $in->flush;
-               $in->sysseek(0, SEEK_SET);
+               $in = input_to_file($env) or return r(500);
        }
        my ($rpipe, $wpipe);
        unless (pipe($rpipe, $wpipe)) {
-               $err->print('error creating pipe', $!, "\n");
+               $err->print("error creating pipe: $!\n");
                return r(500);
        }
        my $pid = fork; # TODO: vfork under Linux...
        unless (defined $pid) {
-               $err->print('error forking: ', $!, "\n");
+               $err->print("error forking: $!\n");
                return r(500);
        }
+       my $git_dir = $git->{git_dir};
        if ($pid == 0) {
                # GIT_HTTP_EXPORT_ALL, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL
                # may be set in the server-process and are passed as-is
@@ -172,36 +162,47 @@ sub serve_smart {
                }
                # $ENV{GIT_PROJECT_ROOT} = $git->{git_dir};
                $ENV{GIT_HTTP_EXPORT_ALL} = '1';
-               $ENV{PATH_TRANSLATED} = "$git->{git_dir}/$path";
+               $ENV{PATH_TRANSLATED} = "$git_dir/$path";
                dup2(fileno($in), 0) or die "redirect stdin failed: $!\n";
                dup2(fileno($wpipe), 1) or die "redirect stdout failed: $!\n";
                my @cmd = qw(git http-backend);
                exec(@cmd) or die 'exec `' . join(' ', @cmd). "' failed: $!\n";
        }
        $wpipe = $in = undef;
-       $rpipe->blocking(0);
        $buf = '';
-       my $vin;
-       vec($vin, fileno($rpipe), 1) = 1;
-       my ($fh, $res);
-       my $fail = sub {
-               my ($e) = @_;
-               if ($e eq 'EAGAIN') {
-                       select($vin, undef, undef, undef);
+       my ($vin, $fh, $res);
+       my $end = sub {
+               if ($fh) {
+                       $fh->close;
+                       $fh = undef;
                } else {
+                       $res->(r(500)) if $res;
+               }
+               if ($rpipe) {
+                       $rpipe->close; # _may_ be Danga::Socket::close
                        $rpipe = undef;
-                       $fh->close if $fh;
-                       $err->print('git http-backend error: ', $e, "\n");
+               }
+               if (defined $pid) {
+                       my $wpid = $pid;
+                       $pid = undef;
+                       return if $wpid == waitpid($wpid, 0);
+                       $err->print("git http-backend ($git_dir): $?\n");
                }
        };
-       my $cb = sub {
-               my $r = sysread($rpipe, $buf, 8192, length($buf));
-               return $fail->($!{EAGAIN} ? 'EAGAIN' : $!) unless defined $r;
-               if ($r == 0) { # EOF
-                       $rpipe = undef;
-                       $fh->close if $fh;
+       my $fail = sub {
+               my ($e) = @_;
+               if ($e eq 'EAGAIN') {
+                       select($vin, undef, undef, undef) if defined $vin;
+                       # $vin is undef on async, so this is a noop on EAGAIN
                        return;
                }
+               $end->();
+               $err->print("git http-backend ($git_dir): $e\n");
+       };
+       my $cb = sub { # read git-http-backend output and stream to client
+               my $r = $rpipe ? $rpipe->sysread($buf, 8192, length($buf)) : 0;
+               return $fail->($!{EAGAIN} ? 'EAGAIN' : $!) unless defined $r;
+               return $end->() if $r == 0; # EOF
                if ($fh) { # stream body from git-http-backend to HTTP client
                        $fh->write($buf);
                        $buf = '';
@@ -219,14 +220,43 @@ sub serve_smart {
                        }
                        # write response header:
                        $fh = $res->([ $code, \@h ]);
+                       $res = undef;
                        $fh->write($buf);
                        $buf = '';
                } # else { keep reading ... }
        };
-       sub {
-               ($res) = @_;
-               while ($rpipe) { $cb->() }
-       };
+       if (my $async = $env->{'pi-httpd.async'}) {
+               $rpipe = $async->($rpipe, $cb);
+               sub { ($res) = @_ } # let Danga::Socket handle the rest.
+       } else { # synchronous loop
+               $vin = '';
+               vec($vin, fileno($rpipe), 1) = 1;
+               sub {
+                       ($res) = @_;
+                       while ($rpipe) { $cb->() }
+               }
+       }
+}
+
+# FIXME: untested, our -httpd _always_ gives a real file handle
+sub input_to_file {
+       my ($env) = @_;
+       my $in = IO::File->new_tmpfile;
+       my $input = $env->{'psgi.input'};
+       my $buf;
+       while (1) {
+               my $r = $input->read($buf, 8192);
+               unless (defined $r) {
+                       my $err = $env->{'psgi.errors'};
+                       $err->print("error reading input: $!\n");
+                       return;
+               }
+               last if ($r == 0);
+               $in->write($buf);
+       }
+       $in->flush;
+       $in->sysseek(0, SEEK_SET);
+       return $in;
 }
 
 1;