X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FGzipFilter.pm;h=115660cb13b89597b448216d3102a603396526b5;hb=b8b03f9c896432816019828b27708fa3b6903d83;hp=d883130f39f7fb1cb938ffa6435175d679cc3fd4;hpb=a71cb67a1237c450a9cbbd6738c5af3b73ba4c61;p=public-inbox.git

diff --git a/lib/PublicInbox/GzipFilter.pm b/lib/PublicInbox/GzipFilter.pm
index d883130f..115660cb 100644
--- a/lib/PublicInbox/GzipFilter.pm
+++ b/lib/PublicInbox/GzipFilter.pm
@@ -4,15 +4,12 @@
 # Qspawn filter
 package PublicInbox::GzipFilter;
 use strict;
-use bytes (); # length
+use parent qw(Exporter);
 use Compress::Raw::Zlib qw(Z_FINISH Z_OK);
+our @EXPORT_OK = qw(gzip_maybe);
 my %OPT = (-WindowBits => 15 + 16, -AppendOutput => 1);
 
-sub new {
-	my ($gz, $err) = Compress::Raw::Zlib::Deflate->new(%OPT);
-	$err == Z_OK or die "Deflate->new failed: $err";
-	bless { gz => $gz }, shift;
-}
+sub new { bless {}, shift }
 
 # for Qspawn if using $env->{'pi-httpd.async'}
 sub attach {
@@ -21,19 +18,39 @@ sub attach {
 	$self
 }
 
+sub gzip_maybe ($) {
+	my ($env) = @_;
+	return if (($env->{HTTP_ACCEPT_ENCODING}) // '') !~ /\bgzip\b/;
+
+	# in case Plack::Middleware::Deflater is loaded:
+	$env->{'plack.skip-deflater'} = 1;
+
+	my ($gz, $err) = Compress::Raw::Zlib::Deflate->new(%OPT);
+	$err == Z_OK ? $gz : undef;
+}
+
 # for GetlineBody (via Qspawn) when NOT using $env->{'pi-httpd.async'}
 sub translate ($$) {
 	my $self = $_[0];
+
+	# allocate the zlib context lazily here, instead of in ->new.
+	# Deflate contexts are memory-intensive and this object may
+	# be sitting in the Qspawn limiter queue for a while.
+	my $gz = $self->{gz} //= do {
+		my ($g, $err) = Compress::Raw::Zlib::Deflate->new(%OPT);
+		$err == Z_OK or die "Deflate->new failed: $err";
+		$g;
+	};
 	my $zbuf = delete($self->{zbuf});
 	if (defined $_[1]) { # my $buf = $_[1];
-		my $err = $self->{gz}->deflate($_[1], $zbuf);
+		my $err = $gz->deflate($_[1], $zbuf);
 		die "gzip->deflate: $err" if $err != Z_OK;
 		return $zbuf if length($zbuf) >= 8192;
 
 		$self->{zbuf} = $zbuf;
 		'';
 	} else { # undef == EOF
-		my $err = $self->{gz}->flush($zbuf, Z_FINISH);
+		my $err = $gz->flush($zbuf, Z_FINISH);
 		die "gzip->flush: $err" if $err != Z_OK;
 		$zbuf;
 	}