nntp: allow and ignore empty commands

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

diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index 56d8e010f96b7d2db8061f100213b1e47f6eaf8e..c574c9e62290dc2dbea4085d866675983126c414 100644 (file)
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -116,6 +116,7 @@ sub args_ok ($$) {
 sub process_line ($$) {
        my ($self, $l) = @_;
        my ($req, @args) = split(/\s+/, $l);
+       return unless defined($req);
        $req = lc($req);
        $req = eval {
                no strict 'refs';
@@ -336,7 +337,7 @@ sub cmd_newnews ($$$$;$$) {
        long_response($self, 0, long_response_limit, sub {
                my ($i) = @_;
                my $srch = $srch[0];
-               my $res = $srch->query($ts, $opts);
+               my $res = $srch->query_ts($ts, $opts);
                my $msgs = $res->{msgs};
                if (my $nr = scalar @$msgs) {
                        more($self, '<' .
@@ -590,9 +591,10 @@ sub long_response ($$$$) {
 
                my $err;
                do {
-                       eval { $cb->(\$beg) };
+                       eval { $cb->(\$beg, \$lim) };
                } until (($err = $@) || $self->{closed} ||
-                        ++$beg > $end || !--$lim || $self->{write_buf_size});
+                        ++$beg > $end || --$lim < 0 ||
+                        $self->{write_buf_size});
 
                if ($err || $self->{closed}) {
                        $self->{long_res} = undef;
@@ -609,7 +611,7 @@ sub long_response ($$$$) {
                                update_idle_time($self);
                                $self->watch_read(1);
                        }
-               } elsif (!$lim || $self->{write_buf_size}) {
+               } elsif ($lim < 0 || $self->{write_buf_size}) {
                        # no recursion, schedule another call ASAP
                        # but only after all pending writes are done
                        update_idle_time($self);
@@ -715,11 +717,12 @@ sub hdr_searchmsg ($$$$) {
                more($self, $xhdr ? r221 : r225);
                my $off = 0;
                long_response($self, $beg, $end, sub {
-                       my ($i) = @_;
+                       my ($i, $lim) = @_;
                        my $res = $srch->query_xover($beg, $end, $off);
                        my $msgs = $res->{msgs};
                        my $nr = scalar @$msgs or return;
                        $off += $nr;
+                       $$lim -= $nr;
                        my $tmp = '';
                        foreach my $s (@$msgs) {
                                $tmp .= $s->num . ' ' . $s->$field . "\r\n";
@@ -853,11 +856,12 @@ sub cmd_xover ($;$) {
        my $srch = $self->{ng}->search;
        my $off = 0;
        long_response($self, $beg, $end, sub {
-               my ($i) = @_;
+               my ($i, $lim) = @_;
                my $res = $srch->query_xover($beg, $end, $off);
                my $msgs = $res->{msgs};
                my $nr = scalar @$msgs or return;
                $off += $nr;
+               $$lim -= $nr;
 
                # OVERVIEW.FMT
                more($self, join("\r\n", map {
@@ -946,11 +950,13 @@ 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;
-       while ($r > 0 && $self->{rbuf} =~ s/\A\s*([^\r\n]+)\r?\n//) {
+       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;
                my $t0 = now();
@@ -970,7 +976,7 @@ sub event_read {
 sub watch_read {
        my ($self, $bool) = @_;
        my $rv = $self->SUPER::watch_read($bool);
-       if ($bool && $self->{rbuf} ne '') {
+       if ($bool && index($self->{rbuf}, "\n") >= 0) {
                # Force another read if there is a pipelined request.
                # We don't know if the socket has anything for us to read,
                # and we must double-check again by the time the timer fires