X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FNNTP.pm;h=c574c9e62290dc2dbea4085d866675983126c414;hb=119463b3b8517e5ec149198bb83588999118ee1d;hp=1e564634901ef69d8221d2ddbb19dc4d13cdb8b2;hpb=747dadaf56334765b29e63e6559e735b914edff9;p=public-inbox.git

diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index 1e564634..c574c9e6 100644
--- 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, '<' .
@@ -949,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();
@@ -973,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