-# 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>
#
# Generic PSGI server for convenience. It aims to provide
use Plack::HTTPParser qw(parse_http_request); # XS or pure Perl
use HTTP::Status qw(status_message);
use HTTP::Date qw(time2str);
-use Scalar::Util qw(weaken);
use IO::Handle;
use constant {
CHUNK_START => -1, # [a-f0-9]+\r\n
}
}
-sub response_done ($$) {
+sub response_done_cb ($$) {
my ($self, $alive) = @_;
- my $env = $self->{env};
- $self->{env} = undef;
- $self->write("0\r\n\r\n") if $alive == 2;
- $self->write(sub { $alive ? next_request($self) : $self->close });
+ sub {
+ my $env = $self->{env};
+ $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 ($$$) {
$close->();
}
-sub getline_response {
- my ($self, $body, $write, $close) = @_;
- $self->{forward} = $body;
- weaken($self);
+sub getline_response ($$$) {
+ my ($self, $write, $close) = @_;
my $pull = $self->{pull} = sub { getline_cb($self, $write, $close) };
$pull->();
}
sub response_write {
my ($self, $env, $res) = @_;
my $alive = response_header_write($self, $env, $res);
-
+ my $close = response_done_cb($self, $alive);
my $write = $alive == 2 ? chunked_wcb($self) : identity_wcb($self);
- my $close = sub { response_done($self, $alive) };
if (defined(my $body = $res->[2])) {
if (ref $body eq 'ARRAY') {
$write->($_) foreach @$body;
$close->();
} else {
- getline_response($self, $body, $write, $close);
+ $self->{forward} = $body;
+ getline_response($self, $write, $close);
}
} else {
# this is returned to the calling application:
if (MSG_MORE && !$self->{write_buf_size}) {
my $n = send($self->{sock}, $_[1], MSG_MORE);
if (defined $n) {
- my $dlen = length($_[1]);
- return 1 if $n == $dlen; # all done!
- $_[1] = substr($_[1], $n, $dlen - $n);
+ my $nlen = length($_[1]) - $n;
+ return 1 if $nlen == 0; # all done!
+ eval { $_[1] = substr($_[1], $n, $nlen) };
+ if ($@) { # modification of read-only value:
+ return $self->write(substr($_[1], $n, $nlen));
+ }
# fall through to normal write:
}
}
sub input_prepare {
my ($self, $env) = @_;
- my $input = $null_io;
+ my $input;
my $len = $env->{CONTENT_LENGTH};
if ($len) {
if ($len > $MAX_REQUEST_BUFFER) {
} elsif (env_chunked($env)) {
$len = CHUNK_START;
open($input, '+>', undef);
+ } else {
+ $input = $null_io;
}
# TODO: expire idle clients on ENFILE / EMFILE
my $self = shift;
my $forward = $self->{forward};
my $env = $self->{env};
- delete $env->{'psgix.io'} if $env; # prevent circular referernces
+ delete $env->{'psgix.io'} if $env; # prevent circular references
$self->{pull} = $self->{forward} = $self->{env} = undef;
if ($forward) {
eval { $forward->close };