Merge remote-tracking branch 'origin/danga-bundle'

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

diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index 13591e5d983c06af9606a1107e151aa201755ad6..5c5df7b0dcbe548c0284504c84ec64f782de8d18 100644 (file)
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -5,7 +5,7 @@
 package PublicInbox::NNTP;
 use strict;
 use warnings;
-use base qw(Danga::Socket);
+use base qw(PublicInbox::DS);
 use fields qw(nntpd article rbuf ng long_res);
 use PublicInbox::Search;
 use PublicInbox::Msgmap;
@@ -122,7 +122,7 @@ sub args_ok ($$) {
 sub process_line ($$) {
        my ($self, $l) = @_;
        my ($req, @args) = split(/\s+/, $l);
-       return unless defined($req);
+       return 1 unless defined($req); # skip blank line
        $req = lc($req);
        $req = eval {
                no strict 'refs';
@@ -936,7 +936,7 @@ sub do_more ($$) {
        do_write($self, $data);
 }
 
-# callbacks for Danga::Socket
+# callbacks for PublicInbox::DS
 
 sub event_hup { $_[0]->close }
 sub event_err { $_[0]->close }
@@ -989,7 +989,7 @@ sub check_read {
        } else {
                # no pipelined requests available, let the kernel know
                # to wake us up if there's more
-               $self->watch_read(1); # Danga::Socket::watch_read
+               $self->watch_read(1); # PublicInbox::DS::watch_read
        }
 }