-# Copyright (C) 2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2019-2020 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
# global deflate context and buffer
my $zbuf = \(my $buf = '');
-my $zout = Compress::Raw::Zlib::Deflate->new(
- # nnrpd (INN) and Compress::Raw::Zlib favor MemLevel=9,
- # but the zlib C library and git use MemLevel=8 as the default.
- # FIXME: sometimes clients fail with 8, so we use 9
- # -MemLevel => 9,
+my $zout;
+{
+ my $err;
+ ($zout, $err) = Compress::Raw::Zlib::Deflate->new(
+ # nnrpd (INN) and Compress::Raw::Zlib favor MemLevel=9,
+ # the zlib C library and git use MemLevel=8 as the default
+ # -MemLevel => 9,
+ -Bufsize => 65536, # same as nnrpd
+ -WindowBits => -15, # RFC 1951
+ -AppendOutput => 1,
+ );
+ $err == Z_OK or die "Failed to initialize zlib deflate stream: $err";
+}
- # needs more testing, nothing obviously different in terms of memory
- -Bufsize => 65536,
-
- -WindowBits => -15, # RFC 1951
- -AppendOutput => 1,
-);
sub enable {
my ($class, $self) = @_;
+ my ($in, $err) = Compress::Raw::Zlib::Inflate->new(%IN_OPT);
+ if ($err != Z_OK) {
+ $self->err("Inflate->new failed: $err");
+ $self->res('403 Unable to activate compression');
+ return;
+ }
unlock_hash(%$self);
+ $self->res('206 Compression active');
bless $self, $class;
- $self->{zin} = [ Compress::Raw::Zlib::Inflate->new(%IN_OPT), '' ];
+ $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;