X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FNNTPdeflate.pm;h=352d4842834816a0df1523575aa4a6ea7f3326b3;hb=1c3e60b66e01df89afdf74990a849a5a7386f9c7;hp=f2de0f381c470f6b8c616aa43aff424fae2c65cc;hpb=a090752ccc1bdbe5d90ec54dbecbb1a44f3f8091;p=public-inbox.git
diff --git a/lib/PublicInbox/NNTPdeflate.pm b/lib/PublicInbox/NNTPdeflate.pm
index f2de0f38..352d4842 100644
--- a/lib/PublicInbox/NNTPdeflate.pm
+++ b/lib/PublicInbox/NNTPdeflate.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 all contributors
+# Copyright (C) all contributors
# License: AGPL-3.0+
# 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,
@@ -50,30 +48,41 @@ sub enable {
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');
+ $self->write(\"403 Unable to activate compression\r\n");
return;
}
- unlock_hash(%$self);
- $self->res('206 Compression active');
+ $self->write(\"206 Compression active\r\n");
bless $self, $class;
- $self->{zin} = [ $in, '' ];
+ $self->{zin} = $in;
}
# overrides PublicInbox::NNTP::compressed
sub compressed { 1 }
-# $_[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 = PublicInbox::DS::do_read($self, $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:
+ #
+ # 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;