X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=lib%2FPublicInbox%2FGzipFilter.pm;h=20030433fa1e7ded0a95f3dc97ba27e0f8d5c828;hp=f1354d2b7eb4e015a54aca61c129df1c70838ab4;hb=0821af5f21fdb083020ae2e3e79e4227ef59cd4f;hpb=f60f934cfe1e7a06c853741fbabbbbe3a9a747a4 diff --git a/lib/PublicInbox/GzipFilter.pm b/lib/PublicInbox/GzipFilter.pm index f1354d2b..20030433 100644 --- a/lib/PublicInbox/GzipFilter.pm +++ b/lib/PublicInbox/GzipFilter.pm @@ -7,8 +7,8 @@ # # In newer versions, public-inbox-httpd supports a backpressure-aware # pull/push model which also accounts for slow git blob storage. -# {async_next} callbacks only run when the DS {wbuf} is drained -# {async_eml} callbacks only run when a blob arrives from git. +# async_next callbacks only run when the DS {wbuf} is drained +# async_eml callbacks only run when a blob arrives from git. # # We continue to support getline+close for generic PSGI servers. package PublicInbox::GzipFilter; @@ -46,18 +46,16 @@ sub gz_or_noop { sub gzf_maybe ($$) { bless { gz => gz_or_noop(@_) }, __PACKAGE__ } sub psgi_response { - my ($self, $code, $res_hdr, $next_cb, $eml_cb) = @_; + my ($self, $code, $res_hdr) = @_; my $env = $self->{env}; $self->{gz} //= gz_or_noop($res_hdr, $env); if ($env->{'pi-httpd.async'}) { - $self->{async_next} = $next_cb; - $self->{async_eml} = $eml_cb; my $http = $env->{'psgix.io'}; # PublicInbox::HTTP $http->{forward} = $self; sub { my ($wcb) = @_; # -httpd provided write callback $self->{http_out} = $wcb->([$code, $res_hdr]); - $next_cb->($http); # start stepping + $self->can('async_next')->($http); # start stepping }; } else { # generic PSGI code path [ $code, $res_hdr, $self ]; @@ -172,12 +170,12 @@ sub async_blob_cb { # git->cat_async callback # it's possible to have TOCTOU if an admin runs # public-inbox-(edit|purge), just move onto the next message warn "E: $smsg->{blob} missing in $self->{-inbox}->{inboxdir}\n"; - return $http->next_step($self->{async_next}); + return $http->next_step($self->can('async_next')); } $smsg->{blob} eq $oid or bail($self, "BUG: $smsg->{blob} != $oid"); - eval { $self->{async_eml}->($self, PublicInbox::Eml->new($bref)) }; + eval { $self->async_eml(PublicInbox::Eml->new($bref)) }; bail($self, "E: async_eml: $@") if $@; - $http->next_step($self->{async_next}); + $http->next_step($self->can('async_next')); } sub smsg_blob {