X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FHTTP.pm;h=ca162939c9f1ea47ecefe47333139eff9e42a0ed;hb=69ff4be6e7c8257834815dbdc0a2fd3563f6f350;hp=e65988bedf06fe2c5236e333bd7fc075021168b4;hpb=c410bf707fb77b15698e14119dbf6e14e43479ba;p=public-inbox.git
diff --git a/lib/PublicInbox/HTTP.pm b/lib/PublicInbox/HTTP.pm
index e65988be..ca162939 100644
--- a/lib/PublicInbox/HTTP.pm
+++ b/lib/PublicInbox/HTTP.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2021 all contributors
+# Copyright (C) all contributors
# License: AGPL-3.0+
#
# Generic PSGI server for convenience. It aims to provide
@@ -43,7 +43,13 @@ use Errno qw(EAGAIN);
our $MAX_REQUEST_BUFFER = $ENV{GIT_HTTP_MAX_REQUEST_BUFFER} ||
(10 * 1024 * 1024);
-open(my $null_io, '<', '/dev/null') or die "failed to open /dev/null: $!";
+open(my $null_io, '<', '/dev/null') or die "open /dev/null: $!";
+{
+ my @n = stat($null_io) or die "stat(/dev/null): $!";
+ my @i = stat(STDIN) or die "stat(STDIN): $!";
+ $null_io = *STDIN{IO} if "@n[0, 1]" eq "@i[0, 1]";
+}
+
my $http_date;
my $prev = 0;
sub http_date () {
@@ -52,8 +58,8 @@ sub http_date () {
}
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) {
@@ -69,7 +75,7 @@ sub new ($$$) {
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,
@@ -78,7 +84,7 @@ sub event_step { # called by PublicInbox::DS
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
@@ -135,7 +141,7 @@ sub app_dispatch {
$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) {
@@ -145,7 +151,7 @@ sub app_dispatch {
# 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]) });
@@ -185,6 +191,7 @@ sub response_header_write {
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))) {
@@ -224,6 +231,7 @@ sub identity_write ($$) {
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);
}
@@ -288,7 +296,7 @@ sub response_write {
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';