http|nntp: avoid recursion inside ->write

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

diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index 895858b754cd44e0a95e99889075a444b54393ee..f4208f878d9cd7e8a091609b25f22badfd001f65 100644 (file)
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -14,7 +14,7 @@ use PublicInbox::Git;
 require PublicInbox::EvCleanup;
 use Email::Simple;
 use POSIX qw(strftime);
-PublicInbox::DS->import(qw(now));
+use PublicInbox::DS qw(now);
 use Digest::SHA qw(sha1_hex);
 use Time::Local qw(timegm timelocal);
 use constant {
@@ -658,7 +658,8 @@ sub long_response ($$) {
                        $long_cb = undef;
                        res($self, '.');
                        out($self, " deferred[$fd] done - %0.6f", now() - $t0);
-                       $self->requeue unless $self->{wbuf};
+                       my $wbuf = $self->{wbuf};
+                       $self->requeue unless $wbuf && @$wbuf;
                }
        };
        $self->write($long_cb); # kick off!
@@ -922,9 +923,8 @@ sub cmd_starttls ($) {
 # RFC 8054
 sub cmd_compress ($$) {
        my ($self, $alg) = @_;
-       return '503 Only the DEFLATE is supported' if uc($alg) ne 'DEFLATE';
+       return '503 Only DEFLATE is supported' if uc($alg) ne 'DEFLATE';
        return r502 if $self->compressed || !$have_deflate;
-       res($self, '206 Compression active');
        PublicInbox::NNTPdeflate->enable($self);
        $self->requeue;
        undef