lib/PublicInbox/View.pm | 2 +- lib/PublicInbox/ViewVCS.pm | 5 +---- lib/PublicInbox/WwwStream.pm | 8 ++++---- diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index 1cbc62bee5f29f7280d83b2a332a34d19eeb6a06..c6fd05cce3a59e8327c4959db3f7480ff759b0b7 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -61,7 +61,7 @@ multipart_text_as_html($eml, $ctx); ${$ctx->{obuf}} .= '
'; } html_footer($ctx, $eml); - $ctx->html_done(200); + $ctx->html_done; } # public functions: (unstable) diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm index ed4a645451176be47a38d9ccaa359907f114034f..d3ac1a7d5d111e40a8c32babcfe81eac312370b9 100644 --- a/lib/PublicInbox/ViewVCS.pm +++ b/lib/PublicInbox/ViewVCS.pm @@ -253,10 +253,7 @@ possible to have multiple root commits when merging independent histories. Every commit references one top-level tree object. EOM - $x = $ctx->zflush($x, $ctx->_html_end); - my $res_hdr = delete $ctx->{-res_hdr}; - push @$res_hdr, 'Content-Length', length($x); - delete($ctx->{env}->{'qspawn.wcb'})->([200, $res_hdr, [$x]]); + delete($ctx->{env}->{'qspawn.wcb'})->($ctx->html_done($x)); } sub stream_patch_parse_hdr { # {parse_hdr} for Qspawn diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm index 1fc213d45f6b0457697ef1d7596e66b91e0d066b..c23668a440bbcfe12c4eee3d7ffb52533c21ae1a 100644 --- a/lib/PublicInbox/WwwStream.pm +++ b/lib/PublicInbox/WwwStream.pm @@ -167,12 +167,12 @@ delete $ctx->{cb}; $ctx->zflush(_html_end($ctx)); } -sub html_done ($$) { - my ($ctx, $code) = @_; - my $bdy = $ctx->zflush(_html_end($ctx)); +sub html_done ($;@) { + my $ctx = $_[0]; + my $bdy = $ctx->zflush(@_[1..$#_], _html_end($ctx)); my $res_hdr = delete $ctx->{-res_hdr}; push @$res_hdr, 'Content-Length', length($bdy); - [ $code, $res_hdr, [ $bdy ] ] + [ 200, $res_hdr, [ $bdy ] ] } sub html_oneshot ($$;@) {