X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=lib%2FPublicInbox%2FIMAPdeflate.pm;h=d5929ef26ed5dfd85d2d74e62172b75758066bf0;hp=9366db7a7fc84d85e0f649a16eac4ba25275da71;hb=9b0c238f887475d920a8589b492ec15c63770152;hpb=90f11ce471c53365a77896c847d0a39b0995b5b5
diff --git a/lib/PublicInbox/IMAPdeflate.pm b/lib/PublicInbox/IMAPdeflate.pm
index 9366db7a..d5929ef2 100644
--- a/lib/PublicInbox/IMAPdeflate.pm
+++ b/lib/PublicInbox/IMAPdeflate.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2020 all contributors
+# Copyright (C) 2020-2021 all contributors
# License: AGPL-3.0+
# TODO: reduce duplication from PublicInbox::NNTPdeflate
@@ -9,7 +9,6 @@ use warnings;
use 5.010_001;
use base qw(PublicInbox::IMAP);
use Compress::Raw::Zlib;
-use Hash::Util qw(unlock_hash); # dependency of fields for perl 5.10+, anyways
my %IN_OPT = (
-Bufsize => 1024,
@@ -41,7 +40,6 @@ sub enable {
$self->write(\"$tag BAD failed to activate compression\r\n");
return;
}
- unlock_hash(%$self);
$self->write(\"$tag OK DEFLATE active\r\n");
bless $self, $class;
$self->{zin} = $in;
@@ -50,7 +48,6 @@ sub enable {
# overrides PublicInbox::NNTP::compressed
sub compressed { 1 }
-# $_[1] may be a reference or not
sub do_read ($$$$) {
my ($self, $rbuf, $len, $off) = @_;
@@ -60,6 +57,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:
+ #
+ # 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);