]> Sergey Matveev's repositories - public-inbox.git/commitdiff
nntp: do not drain rbuf if there is a command pending
authorEric Wong <e@80x24.org>
Wed, 7 Mar 2018 19:05:20 +0000 (19:05 +0000)
committerEric Wong <e@80x24.org>
Wed, 14 Mar 2018 06:16:13 +0000 (06:16 +0000)
Some clients pipeline requests aggressively (enough to match
LINE_MAX) and we should not read from the client socket until we
know there's no pending command in our read buffer.

Reported-and-tested-by: Sergey Organov <sorganov@gmail.com>
lib/PublicInbox/NNTP.pm

index 1e564634901ef69d8221d2ddbb19dc4d13cdb8b2..267fe4b93067189661204d408a842ea8f89dfb19 100644 (file)
@@ -949,10 +949,12 @@ sub event_write {
 sub event_read {
        my ($self) = @_;
        use constant LINE_MAX => 512; # RFC 977 section 2.3
-       my $r = 1;
 
-       my $buf = $self->read(LINE_MAX) or return $self->close;
-       $self->{rbuf} .= $$buf;
+       if (index($self->{rbuf}, "\n") < 0) {
+               my $buf = $self->read(LINE_MAX) or return $self->close;
+               $self->{rbuf} .= $$buf;
+       }
+       my $r = 1;
        while ($r > 0 && $self->{rbuf} =~ s/\A\s*([^\r\n]+)\r?\n//) {
                my $line = $1;
                return $self->close if $line =~ /[[:cntrl:]]/s;