Skip to content

Remove duplication in the encoder #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Remove duplication in the encoder #15

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9b84c33
simplify (and speed up) header output checks
ap Feb 16, 2019
0bd26db
turn conditional block into guard
ap Feb 16, 2019
54c283b
extract common code to crank the encoder
ap Feb 16, 2019
e7837c9
extract common return case
ap Feb 16, 2019
3d8b3d1
extract common header generation
ap Feb 16, 2019
9fe4b01
flip conditions for readability
ap Feb 16, 2019
088f848
skip CRC computation for deflate
ap Feb 16, 2019
f5b6194
cache gzip encoding string comparison
ap Feb 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 21 additions & 20 deletions lib/Plack/Middleware/Deflater.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,15 @@ use constant GZIP_MAGIC => 0x1f8b;
sub new {
my $class = shift;
my $encoding = shift;
my ($encoder,$status) = $encoding eq 'gzip'
my $gzip = $encoding eq 'gzip';
my ($encoder,$status) = $gzip
? deflateInit(-WindowBits => -MAX_WBITS())
: deflateInit(-WindowBits => MAX_WBITS());
die 'Cannot create a deflation stream' if $status != Z_OK;

bless {
header => 0,
gzip => $gzip,
need_header => $gzip,
closed => 0,
encoding => $encoding,
encoder => $encoder,
Expand All @@ -134,30 +136,29 @@ sub new {
sub print : method {
my $self = shift;
return if $self->{closed};

my $chunk = shift;
if ( ! defined $chunk ) {
my ($buf,$status) = $self->{encoder}->flush();
die "deflate failed: $status" if ( $status != Z_OK );
if ( !$self->{header} && $self->{encoding} eq 'gzip' ) {
$buf = pack("nccVcc",GZIP_MAGIC,Z_DEFLATED,0,time(),0,$Compress::Raw::Zlib::gzip_os_code) . $buf
my ($buf,$status) = defined $chunk ? $self->{encoder}->deflate($chunk) : $self->{encoder}->flush();
die "deflate failed: $status" if ( $status != Z_OK );

if ( defined $chunk ) {
if ( $self->{gzip} ) {
$self->{length} += length $chunk;
$self->{crc} = crc32($chunk,$self->{crc});
}
$buf .= pack("LL", $self->{crc},$self->{length}) if $self->{encoding} eq 'gzip';
return '' if not length $buf;
}
else {
$buf .= pack("LL", $self->{crc},$self->{length}) if $self->{gzip};
$self->{closed} = 1;
return $buf;
}

my ($buf,$status) = $self->{encoder}->deflate($chunk);
die "deflate failed: $status" if ( $status != Z_OK );
$self->{length} += length $chunk;
$self->{crc} = crc32($chunk,$self->{crc});
if ( length $buf ) {
if ( !$self->{header} && $self->{encoding} eq 'gzip' ) {
$buf = pack("nccVcc",GZIP_MAGIC,Z_DEFLATED,0,time(),0,$Compress::Raw::Zlib::gzip_os_code) . $buf
}
$self->{header} = 1;
return $buf;
if ( $self->{need_header} ) {
$buf = pack("nccVcc",GZIP_MAGIC,Z_DEFLATED,0,time(),0,$Compress::Raw::Zlib::gzip_os_code) . $buf;
$self->{need_header} = 0;
}
return '';

return $buf;
}

sub close : method {
Expand Down