X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwStream.pm;h=915a71ba0bd82df950ee498f03c9a2c078a78a79;hb=2fc67a18b7ccd75ea6eb945f18203cbf4bcf228f;hp=2dd8b157ddc7334d49a95fdd97fc7ea47563f59c;hpb=433f6127f648e83b8f12d7b232ff726a34a85beb;p=public-inbox.git diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm index 2dd8b157..915a71ba 100644 --- a/lib/PublicInbox/WwwStream.pm +++ b/lib/PublicInbox/WwwStream.pm @@ -9,6 +9,9 @@ package PublicInbox::WwwStream; use strict; use warnings; +use base qw(Exporter); +our @EXPORT_OK = qw(html_oneshot); +use bytes (); # length use PublicInbox::Hval qw(ascii_html prurl); our $TOR_URL = 'https://www.torproject.org/'; our $CODE_URL = 'https://public-inbox.org/public-inbox.git'; @@ -28,7 +31,7 @@ sub new { bless { nr => 0, - cb => $cb || \&close, + cb => $cb, ctx => $ctx, base_url => base_url($ctx), }, $class; @@ -169,14 +172,19 @@ sub getline { delete $self->{cb} ? _html_end($self) : undef; } -sub oneshot { - my ($ctx, $code, $strref) = @_; +sub html_oneshot ($$;$) { + my ($ctx, $code, $sref) = @_; my $self = bless { ctx => $ctx, base_url => base_url($ctx), }, __PACKAGE__; - [ $code, [ 'Content-Type', 'text/html; charset=UTF-8' ], - [ _html_top($self), $$strref, _html_end($self) ] ] + my @x = (_html_top($self), $sref ? $$sref : (), _html_end($self)); + my $len = 0; + $len += bytes::length($_) for @x; + [ $code, [ + 'Content-Type' => 'text/html; charset=UTF-8', + 'Content-Length' => $len + ], \@x ]; } 1;