use warnings;
use Fcntl qw(:seek);
use IO::File;
-use PublicInbox::Spawn qw(spawn);
use HTTP::Date qw(time2str);
use HTTP::Status qw(status_message);
+use PublicInbox::Qspawn;
# n.b. serving "description" and "cloneurl" should be innocuous enough to
# not cause problems. serving "config" might...
}
sub serve {
- my ($cgi, $git, $path) = @_;
+ my ($env, $git, $path) = @_;
- my $service = $cgi->query_parameters->get('service') || '';
- if ($service =~ /\Agit-\w+-pack\z/ || $path =~ /\Agit-\w+-pack\z/) {
- my $ok = serve_smart($cgi, $git, $path);
+ # Documentation/technical/http-protocol.txt in git.git
+ # requires one and exactly one query parameter:
+ if ($env->{QUERY_STRING} =~ /\Aservice=git-\w+-pack\z/ ||
+ $path =~ /\Agit-\w+-pack\z/) {
+ my $ok = serve_smart($env, $git, $path);
return $ok if $ok;
}
- serve_dumb($cgi, $git, $path);
+ serve_dumb($env, $git, $path);
}
sub err ($@) {
}
sub serve_dumb {
- my ($cgi, $git, $path) = @_;
+ my ($env, $git, $path) = @_;
my @h;
my $type;
return r(404) unless -f $f && -r _; # just in case it's a FIFO :P
my @st = stat(_);
my $size = $st[7];
- my $env = $cgi->{env};
# TODO: If-Modified-Since and Last-Modified?
open my $in, '<', $f or return r(404);
my $code = 200;
push @h, 'Content-Type', $type;
if (($env->{HTTP_RANGE} || '') =~ /\bbytes=(\d*)-(\d*)\z/) {
- ($code, $len) = prepare_range($cgi, $in, \@h, $1, $2, $size);
+ ($code, $len) = prepare_range($env, $in, \@h, $1, $2, $size);
if ($code == 416) {
push @h, 'Content-Range', "bytes */$size";
return [ 416, \@h, [] ];
}
sub prepare_range {
- my ($cgi, $in, $h, $beg, $end, $size) = @_;
+ my ($env, $in, $h, $beg, $end, $size) = @_;
my $code = 200;
my $len = $size;
if ($beg eq '') {
push @$h, "bytes $beg-$end/$size";
# FIXME: Plack::Middleware::Deflater bug?
- $cgi->{env}->{'psgix.no-compress'} = 1;
+ $env->{'psgix.no-compress'} = 1;
}
}
($code, $len);
# returns undef if 403 so it falls back to dumb HTTP
sub serve_smart {
- my ($cgi, $git, $path) = @_;
- my $env = $cgi->{env};
+ my ($env, $git, $path) = @_;
my $in = $env->{'psgi.input'};
my $fd = eval { fileno($in) };
unless (defined $fd && $fd >= 0) {
$in = input_to_file($env) or return r(500);
}
- my ($rpipe, $wpipe);
- unless (pipe($rpipe, $wpipe)) {
- err($env, "error creating pipe: $! - going static");
- return;
- }
my %env = %ENV;
# GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL
# may be set in the server-process and are passed as-is
my $git_dir = $git->{git_dir};
$env{GIT_HTTP_EXPORT_ALL} = '1';
$env{PATH_TRANSLATED} = "$git_dir/$path";
- my %rdr = ( 0 => fileno($in), 1 => fileno($wpipe) );
- my $pid = spawn([qw(git http-backend)], \%env, \%rdr);
- unless (defined $pid) {
- err($env, "error spawning: $! - going static");
- return;
- }
- $wpipe = $in = undef;
- my $fh;
+ my %rdr = ( 0 => fileno($in) );
+ my $x = PublicInbox::Qspawn->new([qw(git http-backend)], \%env, \%rdr);
+ my ($fh, $rpipe);
my $end = sub {
- $rpipe = undef;
- my $e = $pid == waitpid($pid, 0) ?
- $? : "PID:$pid still running?";
- if ($e) {
- err($env, "git http-backend ($git_dir): $e");
+ if (my $err = $x->finish) {
+ err($env, "git http-backend ($git_dir): $err");
drop_client($env);
}
$fh->close if $fh; # async-only
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;
- $r->[0] == 403 ? serve_dumb($cgi, $git, $path) : $r;
+ $r = parse_cgi_headers(\$buf) or return; # incomplete headers
+ $r->[0] == 403 ? serve_dumb($env, $git, $path) : $r;
};
my $res;
my $async = $env->{'pi-httpd.async'};
my $r = $rd_hdr->() or return;
$rd_hdr = undef;
if (scalar(@$r) == 3) { # error:
- $async->close if $async;
+ if ($async) {
+ $async->close; # calls rpipe->close
+ } else {
+ $rpipe->close;
+ $end->();
+ }
return $res->($r);
}
if ($async) {
}
# for synchronous PSGI servers
- $r->[2] = Plack::Util::inline_object(
- close => $end,
- getline => sub {
- my $ret = $buf;
- $buf = undef;
- defined $ret ? $ret : $rpipe->getline;
- });
+ require PublicInbox::GetlineBody;
+ $r->[2] = PublicInbox::GetlineBody->new($rpipe, $end, $buf);
$res->($r);
};
sub {
# holding the input here is a waste of FDs and memory
$env->{'psgi.input'} = undef;
- if ($async) {
- $async = $async->($rpipe, $cb, $end);
- } else { # generic PSGI
- $cb->() while $rd_hdr;
- }
+ $x->start(sub { # may run later, much later...
+ ($rpipe) = @_;
+ $in = undef;
+ if ($async) {
+ $async = $async->($rpipe, $cb, $end);
+ } else { # generic PSGI
+ $cb->() while $rd_hdr;
+ }
+ });
};
}