about summary refs log tree commit homepage
path: root/lib/PublicInbox/NNTP.pm
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2019-06-24 02:52:33 +0000
committerEric Wong <e@80x24.org>2019-06-24 05:26:26 +0000
commit2101e27b937893aa427d8693161966e3673b887e (patch)
tree1a538c0d2a24ab06e37927a3a642eed47432f40f /lib/PublicInbox/NNTP.pm
parentc100879166cbbd6c2481ce68a549dab7d018d826 (diff)
downloadpublic-inbox-2101e27b937893aa427d8693161966e3673b887e.tar.gz
Both NNTP and HTTP have common needs and we can factor
out some common code to make dealing with IO::Socket::SSL
easier.
Diffstat (limited to 'lib/PublicInbox/NNTP.pm')
-rw-r--r--lib/PublicInbox/NNTP.pm9
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index a9e54a68..42fbb255 100644
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -941,17 +941,12 @@ sub event_step {
 
         use constant LINE_MAX => 512; # RFC 977 section 2.3
         my $rbuf = \($self->{rbuf});
-        my $r;
+        my $r = 1;
 
         if (index($$rbuf, "\n") < 0) {
                 my $off = bytes::length($$rbuf);
-                $r = sysread($self->{sock}, $$rbuf, LINE_MAX, $off);
-                unless (defined $r) {
-                        return $! == EAGAIN ? $self->watch_in1 : $self->close;
-                }
-                return $self->close if $r == 0;
+                $r = $self->do_read($rbuf, LINE_MAX, $off) or return;
         }
-        $r = 1;
         while ($r > 0 && $$rbuf =~ s/\A[ \t\r\n]*([^\r\n]*)\r?\n//) {
                 my $line = $1;
                 return $self->close if $line =~ /[[:cntrl:]]/s;