Skip to content

Control flow clarifications/simplifications (and partly minor optimisations/fixes) #14

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 10 commits into
base: master
Choose a base branch
from
Open

Control flow clarifications/simplifications (and partly minor optimisations/fixes) #14

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ac2d146
bail early on missing Accept-Encoding
ap Feb 16, 2019
37c2563
bail early on identity encoding
ap Feb 16, 2019
30fcbe1
delete unreachable code
ap Feb 16, 2019
fda7a03
delete superfluous conditional
ap Feb 16, 2019
4f18296
delete another superfluous conditional
ap Feb 16, 2019
e89ac5c
simplify (and speed up) no-encoding case
ap Feb 16, 2019
a82bdce
delete redundant condition subexpressions
ap Feb 16, 2019
10e6ab9
handle multiple Cache-Control response headers
ap Feb 16, 2019
d27019f
handle multiple Vary response headers
ap Feb 16, 2019
fd6aa09
combine Accept-Encoding checks with no loop
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
57 changes: 21 additions & 36 deletions lib/Plack/Middleware/Deflater.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ sub call {
}

if (Plack::Util::status_with_no_entity_body($res->[0]) or
$h->exists('Cache-Control') && $h->get('Cache-Control') =~ /\bno-transform\b/) {
grep /\bno-transform\b/, $h->get('Cache-Control') ) {
return;
}

my @vary = split /\s*,\s*/, ($h->get('Vary') || '');
my @vary = map +( split /\s*,\s*/, $_ ), $h->get('Vary');
push @vary, 'Accept-Encoding';
push @vary, 'User-Agent' if $self->vary_user_agent;
$h->set('Vary' => join(",", @vary));
Expand All @@ -61,45 +61,30 @@ sub call {
}

# TODO check quality
my $encoding = 'identity';
if ( defined $env->{HTTP_ACCEPT_ENCODING} ) {
for my $enc (qw(gzip deflate identity)) {
if ( $env->{HTTP_ACCEPT_ENCODING} =~ /\b$enc\b/ ) {
$encoding = $enc;
last;
}
}
}
my $ae = $env->{HTTP_ACCEPT_ENCODING} || return;
my $encoding = ($ae =~ /\b(gzip)\b/ || $ae =~ /\b(deflate)\b/)
? $1 : return;

my $encoder;
if ($encoding eq 'gzip' || $encoding eq 'deflate') {
$encoder = Plack::Middleware::Deflater::Encoder->new($encoding);
} elsif ($encoding ne 'identity') {
my $msg = "An acceptable encoding for the requested resource is not found.";
@$res = (406, ['Content-Type' => 'text/plain'], [ $msg ]);
return;
}
my $encoder = Plack::Middleware::Deflater::Encoder->new($encoding);

if ($encoder) {
$h->set('Content-Encoding' => $encoding);
$h->remove('Content-Length');
$h->set('Content-Encoding' => $encoding);
$h->remove('Content-Length');

# normal response
if ( $res->[2] && ref($res->[2]) && ref($res->[2]) eq 'ARRAY' ) {
my $buf = '';
foreach (@{$res->[2]}) {
$buf .= $encoder->print($_) if defined $_;
}
$buf .= $encoder->close();
$res->[2] = [$buf];
return;
# normal response
if ( ref($res->[2]) eq 'ARRAY' ) {
my $buf = '';
foreach (@{$res->[2]}) {
$buf .= $encoder->print($_) if defined $_;
}

# delayed or stream
return sub {
$encoder->print(shift);
};
$buf .= $encoder->close();
$res->[2] = [$buf];
return;
}

# delayed or stream
return sub {
$encoder->print(shift);
};
});
}

Expand Down