-# Copyright (C) 2019 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
# 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,
$self->res('403 Unable to activate compression');
return;
}
- unlock_hash(%$self);
$self->res('206 Compression active');
bless $self, $class;
- $self->{zin} = [ $in, '' ];
+ $self->{zin} = $in;
}
# overrides PublicInbox::NNTP::compressed
sub compressed { 1 }
-# SUPER is PublicInbox::DS::do_read, so $_[1] may be a reference or not
sub do_read ($$$$) {
my ($self, $rbuf, $len, $off) = @_;
my $zin = $self->{zin} or return; # closed
- my $deflated = \($zin->[1]);
- my $r = $self->SUPER::do_read($deflated, $len) or return;
+ my $doff;
+ my $dbuf = delete($self->{dbuf}) // '';
+ $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 $deflated is automatically emptied
- my $err = $zin->[0]->inflate($deflated, $rbuf);
+ # -ConsumeInput is true, so $dbuf is automatically emptied
+ my $err = $zin->inflate($dbuf, $rbuf);
if ($err == Z_OK) {
+ $self->{dbuf} = $dbuf if $dbuf ne '';
$r = length($$rbuf) and return $r;
# nothing ready, yet, get more, later
$self->requeue;