use HTTP::Status qw(status_message);
use HTTP::Date qw(time2str);
use Scalar::Util qw(weaken);
-use IO::File;
+use IO::Handle;
use constant {
CHUNK_START => -1, # [a-f0-9]+\r\n
CHUNK_END => -2, # \r\n
CHUNK_MAX_HDR => 256,
};
-# FIXME: duplicated code with NNTP.pm, layering violation
-my $WEAKEN = {}; # string(inbox) -> inbox
-my $weakt;
-sub weaken_task () {
- $weakt = undef;
- $_->weaken_all for values %$WEAKEN;
- $WEAKEN = {};
-}
-
my $pipelineq = [];
my $pipet;
sub process_pipelineq () {
our $MAX_REQUEST_BUFFER = $ENV{GIT_HTTP_MAX_REQUEST_BUFFER} ||
(10 * 1024 * 1024);
-my $null_io = IO::File->new('/dev/null', '<');
+open(my $null_io, '<', '/dev/null') or die "failed to open /dev/null: $!";
my $http_date;
my $prev = 0;
sub http_date () {
$self->{rbuf} = substr($self->{rbuf}, $r);
my $len = input_prepare($self, \%env);
- defined $len or return write_err($self); # EMFILE/ENFILE
+ defined $len or return write_err($self, undef); # EMFILE/ENFILE
$len ? event_read_input($self) : app_dispatch($self);
}
while ($len > 0) {
if ($$rbuf ne '') {
my $w = write_in_full($input, $rbuf, $len);
- return write_err($self) unless $w;
+ return write_err($self, $len) unless $w;
$len -= $w;
die "BUG: $len < 0 (w=$w)" if $len < 0;
if ($len == 0) { # next request may be pipelined
return if $_[0] eq '';
more($self, sprintf("%x\r\n", bytes::length($_[0])));
more($self, $_[0]);
- $self->write("\r\n");
+
+ # use $self->write("\n\n") if you care about real-time
+ # streaming responses, public-inbox WWW does not.
+ more($self, "\r\n");
}
}
$self->{env} = undef;
$self->write("0\r\n\r\n") if $alive == 2;
$self->write(sub { $alive ? next_request($self) : $self->close });
+}
+
+sub getline_cb ($$$) {
+ my ($self, $write, $close) = @_;
+ local $/ = \8192;
+ my $forward = $self->{forward};
+ # limit our own running time for fairness with other
+ # clients and to avoid buffering too much:
+ if ($forward) {
+ my $buf = eval { $forward->getline };
+ if (defined $buf) {
+ $write->($buf); # may close in Danga::Socket::write
+ unless ($self->{closed}) {
+ my $next = $self->{pull};
+ if ($self->{write_buf_size}) {
+ $self->write($next);
+ } else {
+ PublicInbox::EvCleanup::asap($next);
+ }
+ return;
+ }
+ } elsif ($@) {
+ err($self, "response ->getline error: $@");
+ $forward = undef;
+ $self->close;
+ }
+ }
- # FIXME: layering violation
- if (my $obj = $env->{'pi-httpd.inbox'}) {
- # grace period for reaping resources
- $WEAKEN->{"$obj"} = $obj;
- PublicInbox::EvCleanup::later(*weaken_task);
+ $self->{forward} = $self->{pull} = undef;
+ # avoid recursion
+ if ($forward) {
+ eval { $forward->close };
+ if ($@) {
+ err($self, "response ->close error: $@");
+ $self->close; # idempotent
+ }
}
+ $close->();
}
sub getline_response {
my ($self, $body, $write, $close) = @_;
$self->{forward} = $body;
weaken($self);
- my $pull = $self->{pull} = sub {
- local $/ = \8192;
- my $forward = $self->{forward};
- # limit our own running time for fairness with other
- # clients and to avoid buffering too much:
- my $n = 100;
- while ($forward && defined(my $buf = $forward->getline)) {
- $write->($buf);
- last if $self->{closed};
- if ($self->{write_buf_size}) {
- $self->write($self->{pull});
- return;
- } elsif ((--$n) <= 0) {
- PublicInbox::EvCleanup::asap($self->{pull});
- return;
- }
- }
- $self->{forward} = $self->{pull} = undef;
- $forward->close if $forward; # avoid recursion
- $close->();
- };
+ my $pull = $self->{pull} = sub { getline_cb($self, $write, $close) };
$pull->();
}
quit($self, 413);
return;
}
- $input = IO::File->new_tmpfile;
+ open($input, '+>', undef);
} elsif (env_chunked($env)) {
$len = CHUNK_START;
- $input = IO::File->new_tmpfile;
+ open($input, '+>', undef);
}
# TODO: expire idle clients on ENFILE / EMFILE
sub env_chunked { ($_[0]->{HTTP_TRANSFER_ENCODING} || '') =~ /\bchunked\b/i }
+sub err ($$) {
+ eval { $_[0]->{httpd}->{env}->{'psgi.errors'}->print($_[1]."\n") };
+}
+
sub write_err {
- my ($self) = @_;
- my $err = $self->{httpd}->{env}->{'psgi.errors'};
+ my ($self, $len) = @_;
my $msg = $! || '(zero write)';
- $err->print("error buffering to input: $msg\n");
+ $msg .= " ($len bytes remaining)" if defined $len;
+ err($self, "error buffering to input: $msg");
quit($self, 500);
}
$self->{input_left} = $len;
return;
}
- my $err = $self->{httpd}->{env}->{'psgi.errors'};
- $err->print("error reading for input: $! ($len bytes remaining)\n");
+ err($self, "error reading for input: $! ($len bytes remaining)");
quit($self, 500);
}
until ($len <= 0) {
if ($$rbuf ne '') {
my $w = write_in_full($input, $rbuf, $len);
- return write_err($self) unless $w;
+ return write_err($self, "$len chunk") if !$w;
$len -= $w;
if ($len == 0) {
# we may have leftover data to parse
my $env = $self->{env};
delete $env->{'psgix.io'} if $env; # prevent circular referernces
$self->{pull} = $self->{forward} = $self->{env} = undef;
- $forward->close if $forward;
+ if ($forward) {
+ eval { $forward->close };
+ err($self, "forward ->close error: $@") if $@;
+ }
$self->SUPER::close(@_);
}