imap+nntp: share COMPRESS implementation

[public-inbox.git] / lib / PublicInbox / HTTP.pm

diff --git a/lib/PublicInbox/HTTP.pm b/lib/PublicInbox/HTTP.pm
index 8057481d1ce5629d17b0001d64d0f8f18d321304..76e978a249261f2c8d4872973dfb293db720fb03 100644 (file)
--- a/lib/PublicInbox/HTTP.pm
+++ b/lib/PublicInbox/HTTP.pm
@@ -37,16 +37,6 @@ 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...
@@ -86,32 +76,25 @@ sub event_step { # called by PublicInbox::DS
        # 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 $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 $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);
 }
@@ -202,6 +185,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 +222,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 +237,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 +290,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';