X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FNNTPdeflate.pm;h=352d4842834816a0df1523575aa4a6ea7f3326b3;hb=9b0c238f887475d920a8589b492ec15c63770152;hp=10e2337cda97ba1fa83fcecc28fdfd97592c92b3;hpb=2535900d284028258bea3bb2c1598b675f8f963c;p=public-inbox.git

diff --git a/lib/PublicInbox/NNTPdeflate.pm b/lib/PublicInbox/NNTPdeflate.pm
index 10e2337c..352d4842 100644
--- a/lib/PublicInbox/NNTPdeflate.pm
+++ b/lib/PublicInbox/NNTPdeflate.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 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,
@@ -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 }
 
-# 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;