update copyrights for 2021

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

diff --git a/lib/PublicInbox/NNTPdeflate.pm b/lib/PublicInbox/NNTPdeflate.pm
index eb400c9c22057da11b5bd3d3d396ab79213c7108..06b4499ceac970440a6a83b99fbbc7707b0ff905 100644 (file)
--- a/lib/PublicInbox/NNTPdeflate.pm
+++ b/lib/PublicInbox/NNTPdeflate.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2019-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2019-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # RFC 8054 NNTP COMPRESS DEFLATE implementation
@@ -16,11 +16,9 @@
 #       efficient in terms of server memory usage.
 package PublicInbox::NNTPdeflate;
 use strict;
-use warnings;
 use 5.010_001;
-use base qw(PublicInbox::NNTP);
+use parent qw(PublicInbox::NNTP);
 use Compress::Raw::Zlib;
-use Hash::Util qw(unlock_hash); # dependency of fields for perl 5.10+, anyways
 
 my %IN_OPT = (
        -Bufsize => PublicInbox::NNTP::LINE_MAX,
@@ -53,7 +51,6 @@ sub enable {
                $self->res('403 Unable to activate compression');
                return;
        }
-       unlock_hash(%$self);
        $self->res('206 Compression active');
        bless $self, $class;
        $self->{zin} = $in;
@@ -71,6 +68,16 @@ sub do_read ($$$$) {
        $doff = length($dbuf);
        my $r = PublicInbox::DS::do_read($self, \$dbuf, $len, $doff) or return;
 
+       # Workaround inflate bug appending to OOK scalars:
+       # <https://rt.cpan.org/Ticket/Display.html?id=132734>
+       # We only have $off if the client is pipelining, and pipelining
+       # is where our substr() OOK optimization in event_step makes sense.
+       if ($off) {
+               my $copy = $$rbuf;
+               undef $$rbuf;
+               $$rbuf = $copy;
+       }
+
        # assert(length($$rbuf) == $off) as far as NNTP.pm is concerned
        # -ConsumeInput is true, so $dbuf is automatically emptied
        my $err = $zin->inflate($dbuf, $rbuf);