lib/PublicInbox/DS.pm
lib/PublicInbox/DSKQXS.pm
lib/PublicInbox/DSPoll.pm
+lib/PublicInbox/DSdeflate.pm
lib/PublicInbox/Daemon.pm
lib/PublicInbox/DirIdle.pm
lib/PublicInbox/DummyInbox.pm
lib/PublicInbox/IMAPClient.pm
lib/PublicInbox/IMAPD.pm
lib/PublicInbox/IMAPTracker.pm
-lib/PublicInbox/IMAPdeflate.pm
lib/PublicInbox/IMAPsearchqp.pm
lib/PublicInbox/IPC.pm
lib/PublicInbox/IdxStack.pm
lib/PublicInbox/MultiGit.pm
lib/PublicInbox/NNTP.pm
lib/PublicInbox/NNTPD.pm
-lib/PublicInbox/NNTPdeflate.pm
lib/PublicInbox/NetNNTPSocks.pm
lib/PublicInbox/NetReader.pm
lib/PublicInbox/NetWriter.pm
}
}
-sub zflush {} # overridden by NNTPdeflate and IMAPdeflate
-
+sub zflush {} # overridden by DSdeflate
+sub compressed {} # overridden by DSdeflate
sub long_response_done {} # overridden by Net::NNTP
sub long_step {
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
# RFC 8054 NNTP COMPRESS DEFLATE implementation
+# RFC 4978 IMAP COMPRESS=DEFLATE extension
#
# RSS usage for 10K idle-but-did-something NNTP clients on 64-bit:
# TLS + DEFLATE[a] : 1.8 GB (MemLevel=9, 1.2 GB with MemLevel=8)
# [b] - memory-optimized implementation using a global deflate context.
# It's less efficient in terms of compression, but way more
# efficient in terms of server memory usage.
-package PublicInbox::NNTPdeflate;
+package PublicInbox::DSdeflate;
use strict;
-use 5.010_001;
-use parent qw(PublicInbox::NNTP);
+use v5.10.1;
use Compress::Raw::Zlib;
my %IN_OPT = (
- -Bufsize => PublicInbox::NNTP::LINE_MAX,
+ -Bufsize => 1024,
-WindowBits => -15, # RFC 1951
-AppendOutput => 1,
);
$err == Z_OK or die "Failed to initialize zlib deflate stream: $err";
}
-
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->write(\"403 Unable to activate compression\r\n");
return;
}
- $self->write(\"206 Compression active\r\n");
bless $self, $class;
$self->{zin} = $in;
}
-# overrides PublicInbox::NNTP::compressed
+# overrides PublicInbox::DS::compressed
sub compressed { 1 }
sub do_read ($$$$) {
$self->requeue unless $pending;
}
-sub compressed { undef }
-
# RFC 4978
sub cmd_compress ($$$) {
my ($self, $tag, $alg) = @_;
# CRIME made TLS compression obsolete
# return "$tag NO [COMPRESSIONACTIVE]\r\n" if $self->tls_compressed;
- PublicInbox::IMAPdeflate->enable($self, $tag);
+ PublicInbox::IMAPdeflate->enable($self) or return
+ \"$tag BAD failed to activate compression\r\n";
+ PublicInbox::DS::write($self, \"$tag OK DEFLATE active\r\n");
$self->requeue;
undef
}
sub logged_in { 0 }
+package PublicInbox::IMAPdeflate;
+use PublicInbox::DSdeflate;
+our @ISA = qw(PublicInbox::DSdeflate PublicInbox::IMAP);
+
1;
use PublicInbox::Config;
use PublicInbox::ConfigIter;
use PublicInbox::InboxIdle;
-use PublicInbox::IMAPdeflate; # loads PublicInbox::IMAP
+use PublicInbox::IMAP;
use PublicInbox::DummyInbox;
my $dummy = bless { uidvalidity => 0 }, 'PublicInbox::DummyInbox';
+++ /dev/null
-# Copyright (C) 2020-2021 all contributors <meta@public-inbox.org>
-# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
-# TODO: reduce duplication from PublicInbox::NNTPdeflate
-
-# RFC 4978
-package PublicInbox::IMAPdeflate;
-use strict;
-use warnings;
-use 5.010_001;
-use base qw(PublicInbox::IMAP);
-use Compress::Raw::Zlib;
-
-my %IN_OPT = (
- -Bufsize => 1024,
- -WindowBits => -15, # RFC 1951
- -AppendOutput => 1,
-);
-
-# global deflate context and buffer
-my $zbuf = \(my $buf = '');
-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";
-}
-
-sub enable {
- my ($class, $self, $tag) = @_;
- my ($in, $err) = Compress::Raw::Zlib::Inflate->new(%IN_OPT);
- if ($err != Z_OK) {
- $self->err("Inflate->new failed: $err");
- $self->write(\"$tag BAD failed to activate compression\r\n");
- return;
- }
- $self->write(\"$tag OK DEFLATE active\r\n");
- bless $self, $class;
- $self->{zin} = $in;
-}
-
-# overrides PublicInbox::NNTP::compressed
-sub compressed { 1 }
-
-sub do_read ($$$$) {
- my ($self, $rbuf, $len, $off) = @_;
-
- my $zin = $self->{zin} or return; # closed
- 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 $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;
- } else {
- delete $self->{zin};
- $self->close;
- }
- 0;
-}
-
-# override PublicInbox::DS::msg_more
-sub msg_more ($$) {
- my $self = $_[0];
-
- # $_[1] may be a reference or not for ->deflate
- my $err = $zout->deflate($_[1], $zbuf);
- $err == Z_OK or die "->deflate failed $err";
- 1;
-}
-
-sub zflush ($) {
- my ($self) = @_;
-
- my $deflated = $zbuf;
- $zbuf = \(my $next = '');
-
- my $err = $zout->flush($deflated, Z_FULL_FLUSH);
- $err == Z_OK or die "->flush failed $err";
-
- # We can still let the lower socket layer do buffering:
- PublicInbox::DS::msg_more($self, $$deflated);
-}
-
-# compatible with PublicInbox::DS::write, so $_[1] may be a reference or not
-sub write ($$) {
- my $self = $_[0];
- return PublicInbox::DS::write($self, $_[1]) if ref($_[1]) eq 'CODE';
-
- my $deflated = $zbuf;
- $zbuf = \(my $next = '');
-
- # $_[1] may be a reference or not for ->deflate
- my $err = $zout->deflate($_[1], $deflated);
- $err == Z_OK or die "->deflate failed $err";
- $err = $zout->flush($deflated, Z_FULL_FLUSH);
- $err == Z_OK or die "->flush failed $err";
-
- # We can still let the socket layer do buffering:
- PublicInbox::DS::write($self, $deflated);
-}
-
-1;
$self->long_response(\&xover_i, @$r);
}
-sub compressed { undef }
-
sub cmd_starttls ($) {
my ($self) = @_;
my $sock = $self->{sock} or return;
my ($self, $alg) = @_;
return "503 Only DEFLATE is supported\r\n" if uc($alg) ne 'DEFLATE';
return r502 if $self->compressed;
- PublicInbox::NNTPdeflate->enable($self);
+ PublicInbox::NNTPdeflate->enable($self) or return
+ \"403 Unable to activate compression\r\n";
+ PublicInbox::DS::write($self, \"206 Compression active\r\n");
$self->requeue;
undef
}
defined($self->{rbuf}) || defined($self->{wbuf})
}
+package PublicInbox::NNTPdeflate;
+use PublicInbox::DSdeflate;
+our @ISA = qw(PublicInbox::DSdeflate PublicInbox::NNTP);
+
1;
use Sys::Hostname;
use PublicInbox::Config;
use PublicInbox::InboxIdle;
-use PublicInbox::NNTPdeflate; # loads PublicInbox::NNTP
+use PublicInbox::NNTP;
sub new {
my ($class) = @_;
#!perl -w
-# Copyright (C) 2020-2021 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>
# Idle client memory usage test, particularly after EXAMINE when
# Message Sequence Numbers are loaded
use strict;
our @ISA;
use Compress::Raw::Zlib;
-use PublicInbox::IMAPdeflate;
+use PublicInbox::IMAP;
my %ZIN_OPT;
BEGIN {
@ISA = qw(IMAPC);