-# Copyright (C) 2016-2021 all contributors <meta@public-inbox.org>
+# Copyright (C) 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
}
sub new ($$$) {
- my ($class, $sock, $addr, $httpd) = @_;
- my $self = bless { httpd => $httpd }, $class;
+ my ($class, $sock, $addr, $srv_env) = @_;
+ my $self = bless { srv_env => $srv_env }, $class;
my $ev = EPOLLIN;
my $wbuf;
if ($sock->can('accept_SSL') && !$sock->accept_SSL) {
sub event_step { # called by PublicInbox::DS
my ($self) = @_;
-
+ local $SIG{__WARN__} = $self->{srv_env}->{'pi-httpd.warn_cb'};
return unless $self->flush_write && $self->{sock};
# only read more requests if we've drained the write buffer,
return read_input($self) if ref($self->{env});
my $rbuf = $self->{rbuf} // (\(my $x = ''));
- my %env = %{$self->{httpd}->{env}}; # full hash copy
+ my %env = %{$self->{srv_env}}; # full hash copy
my $r;
while (($r = parse_http_request($$rbuf, \%env)) < 0) {
# We do not support Trailers in chunked requests, for
$env->{REMOTE_ADDR} = $self->{remote_addr};
$env->{REMOTE_PORT} = $self->{remote_port};
if (defined(my $host = $env->{HTTP_HOST})) {
- $host =~ s/:([0-9]+)\z// and $env->{SERVER_PORT} = $1;
+ $host =~ s/:([0-9]+)\z// and $env->{SERVER_PORT} = $1 + 0;
$env->{SERVER_NAME} = $host;
}
if (defined $input) {
# note: NOT $self->{sock}, we want our close (+ PublicInbox::DS::close),
# to do proper cleanup:
$env->{'psgix.io'} = $self; # for ->close or async_pass
- my $res = Plack::Util::run_app($self->{httpd}->{app}, $env);
+ my $res = Plack::Util::run_app($env->{'pi-httpd.app'}, $env);
eval {
if (ref($res) eq 'CODE') {
$res->(sub { response_write($self, $env, $_[0]) });
my $alive;
if (!$term && $prot_persist) { # auto-chunk
$chunked = $alive = 2;
+ $alive = 3 if $env->{REQUEST_METHOD} eq 'HEAD';
$h .= "Transfer-Encoding: chunked\r\n";
# no need for "Connection: keep-alive" with HTTP/1.1
} elsif ($term && ($prot_persist || ($conn =~ /\bkeep-alive\b/i))) {
sub response_done {
my ($self, $alive) = @_;
delete $self->{env}; # we're no longer busy
+ # HEAD requests set $alive = 3 so we don't send "0\r\n\r\n";
$self->write(\"0\r\n\r\n") if $alive == 2;
$self->write($alive ? $self->can('requeue') : \&close);
}
getline_pull($self); # kick-off!
}
# these are returned to the calling application:
- } elsif ($alive == 2) {
+ } elsif ($alive >= 2) {
bless [ $self, $alive ], 'PublicInbox::HTTP::Chunked';
} else {
bless [ $self, $alive ], 'PublicInbox::HTTP::Identity';