lib/PublicInbox/DS.pm | 4 ++-- lib/PublicInbox/DSdeflate.pm | 4 ++-- lib/PublicInbox/IMAP.pm | 2 +- lib/PublicInbox/NNTP.pm | 2 +- diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm index ef483aacf2724a4bf73a50e64223c1b40374f3f2..77e2e5e9d4a4ed0b96ab02be1f246f4c0ad76048 100644 --- a/lib/PublicInbox/DS.pm +++ b/lib/PublicInbox/DS.pm @@ -648,7 +648,7 @@ $self->close; } } -sub zflush {} # overridden by DSdeflate +sub dflush {} # overridden by DSdeflate sub compressed {} # overridden by DSdeflate sub long_response_done {} # overridden by Net::NNTP @@ -682,7 +682,7 @@ sub requeue_once { my ($self) = @_; # COMPRESS users all share the same DEFLATE context. # Flush it here to ensure clients don't see each other's data - $self->zflush; + $self->dflush; # no recursion, schedule another call ASAP, # but only after all pending writes are done. diff --git a/lib/PublicInbox/DSdeflate.pm b/lib/PublicInbox/DSdeflate.pm index bf0ecd3877c79295ed99c90c0e2f750f730b6bfe..639690e27f61873cf29234487bac58315b2a51d1 100644 --- a/lib/PublicInbox/DSdeflate.pm +++ b/lib/PublicInbox/DSdeflate.pm @@ -30,7 +30,7 @@ # global deflate context and buffer my ($zout, $zbuf); { my $err; - $zbuf = \(my $initial = ''); # replaced by $next in zflush/write + $zbuf = \(my $initial = ''); # replaced by $next in dflush/write ($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 @@ -100,7 +100,7 @@ $err == Z_OK or die "->deflate failed $err"; 1; } -sub zflush ($) { +sub dflush ($) { my ($self) = @_; my $deflated = $zbuf; diff --git a/lib/PublicInbox/IMAP.pm b/lib/PublicInbox/IMAP.pm index 805f1102536d99d9cf77807f86e1b0b3e6290ce4..0f0f9b3aaa6722c021132ca96224051d75b8ccc4 100644 --- a/lib/PublicInbox/IMAP.pm +++ b/lib/PublicInbox/IMAP.pm @@ -595,7 +595,7 @@ $pre = ibx_async_prefetch($ibx, $nxt->{blob}, \&fetch_blob_cb, $fetch_arg); } fetch_run_ops($self, $smsg, $bref, $ops, $partial); - $pre ? $self->zflush : $self->requeue_once; + $pre ? $self->dflush : $self->requeue_once; } sub emit_rfc822 { diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm index b223eb07d417bad27115bcf5411090f4e9ab257c..791fe2a94e5b1d253a37176f8f8ccfc3f4bd2346 100644 --- a/lib/PublicInbox/NNTP.pm +++ b/lib/PublicInbox/NNTP.pm @@ -556,7 +556,7 @@ } else { $self->close; die "BUG: bad code: $r"; } - $self->write(\".\r\n"); # flushes (includes ->zflush) + $self->write(\".\r\n"); # flushes (includes ->dflush) $self->requeue; }