X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FHTTP.pm;h=ca162939c9f1ea47ecefe47333139eff9e42a0ed;hb=refs%2Fheads%2Fmaster;hp=8a89dd73b031e56fcb3bd1440026299d1a3f0e52;hpb=96b0a14be7e62742ad06f0a37c3cba61fe6c51e7;p=public-inbox.git diff --git a/lib/PublicInbox/HTTP.pm b/lib/PublicInbox/HTTP.pm index 8a89dd73..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 @@ -37,23 +37,19 @@ use constant { }; use Errno qw(EAGAIN); -my $pipelineq = []; -sub process_pipelineq () { - my $q = $pipelineq; - $pipelineq = []; - foreach (@$q) { - next unless $_->{sock}; - rbuf_process($_); - } -} - # Use the same configuration parameter as git since this is primarily # a slow-client sponge for git-http-backend # TODO: support per-respository http.maxRequestBuffer somehow... 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 () { @@ -62,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) { @@ -79,39 +75,32 @@ 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, # otherwise we can be buffering infinitely w/o backpressure return read_input($self) if ref($self->{env}); - my $rbuf = $self->{rbuf} // (\(my $x = '')); - $self->do_read($rbuf, 8192, length($$rbuf)) or return; - rbuf_process($self, $rbuf); -} -sub rbuf_process { - my ($self, $rbuf) = @_; - $rbuf //= $self->{rbuf} // (\(my $x = '')); - - my %env = %{$self->{httpd}->{env}}; # full hash copy - my $r = parse_http_request($$rbuf, \%env); - - # We do not support Trailers in chunked requests, for now - # (they are rarely-used and git (as of 2.7.2) does not use them) - if ($r == -1 || $env{HTTP_TRAILER} || - # this length-check is necessary for PURE_PERL=1: - ($r == -2 && length($$rbuf) > 0x4000)) { - return quit($self, 400); - } - if ($r < 0) { # incomplete - $self->rbuf_idle($rbuf); - return $self->requeue; + my $rbuf = $self->{rbuf} // (\(my $x = '')); + 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 + # now (they are rarely-used and git (as of 2.7.2) does + # not use them). + # this length-check is necessary for PURE_PERL=1: + if ($r == -1 || $env{HTTP_TRAILER} || + ($r == -2 && length($$rbuf) > 0x4000)) { + return quit($self, 400); + } + $self->do_read($rbuf, 8192, length($$rbuf)) or return; } + return quit($self, 400) if grep(/\s/, keys %env); # stop smugglers $$rbuf = substr($$rbuf, $r); - my $len = input_prepare($self, \%env); - defined $len or return write_err($self, undef); # EMFILE/ENFILE + my $len = input_prepare($self, \%env) // + return write_err($self, undef); # EMFILE/ENFILE $len ? read_input($self, $rbuf) : app_dispatch($self, undef, $rbuf); } @@ -152,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) { @@ -162,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]) }); @@ -202,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))) { @@ -238,22 +228,12 @@ sub identity_write ($$) { $self->write(\($_[1])) if $_[1] ne ''; } -sub next_request ($) { - my ($self) = @_; - if ($self->{rbuf}) { - # avoid recursion for pipelined requests - PublicInbox::DS::requeue(\&process_pipelineq) if !@$pipelineq; - push @$pipelineq, $self; - } else { # wait for next request - $self->requeue; - } -} - 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 ? \&next_request : \&close); + $self->write($alive ? $self->can('requeue') : \&close); } sub getline_pull { @@ -263,7 +243,7 @@ sub getline_pull { # limit our own running time for fairness with other # clients and to avoid buffering too much: my $buf = eval { - local $/ = \8192; + local $/ = \65536; $forward->getline; } if $forward; @@ -316,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'; @@ -459,10 +439,9 @@ sub close { $self->SUPER::close; # PublicInbox::DS::close } -# for graceful shutdown in PublicInbox::Daemon: -sub busy () { +sub busy { # for graceful shutdown in PublicInbox::Daemon: my ($self) = @_; - ($self->{rbuf} || exists($self->{env}) || $self->{wbuf}); + defined($self->{rbuf}) || exists($self->{env}) || defined($self->{wbuf}) } # runs $cb on the next iteration of the event loop at earliest