diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/PublicInbox/Feed.pm | 3 | ||||
-rw-r--r-- | lib/PublicInbox/SearchView.pm | 4 | ||||
-rw-r--r-- | lib/PublicInbox/View.pm | 8 | ||||
-rw-r--r-- | lib/PublicInbox/WWW.pm | 3 | ||||
-rw-r--r-- | lib/PublicInbox/WwwStream.pm | 6 |
5 files changed, 12 insertions, 12 deletions
diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm index c16c417a..2f141c44 100644 --- a/lib/PublicInbox/Feed.pm +++ b/lib/PublicInbox/Feed.pm @@ -48,7 +48,7 @@ sub new_html { } $ctx->{-html_tip} = '<pre>'; $ctx->{-upfx} = ''; - my $res = PublicInbox::WwwStream->new($ctx, sub { + PublicInbox::WwwStream->response($ctx, 200, sub { while (my $path = shift @paths) { my $m = do_cat_mail($ctx->{-inbox}, $path) or next; my $more = scalar @paths; @@ -58,7 +58,6 @@ sub new_html { } undef; }); - [ 200, ['Content-Type', 'text/html; charset=UTF-8'], $res ] } # private subs diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm index 4af6cadb..30a310c9 100644 --- a/lib/PublicInbox/SearchView.pm +++ b/lib/PublicInbox/SearchView.pm @@ -55,9 +55,7 @@ sub sres_top_html { $cb = mset_summary($ctx, $mset, $q); } } - - [ $code, ['Content-Type', 'text/html; charset=UTF-8'], - PublicInbox::WwwStream->new($ctx, $cb) ]; + PublicInbox::WwwStream->response($ctx, $code, $cb); } # display non-threaded search results similar to what users expect from diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index b4f80d1d..27dd1554 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -27,7 +27,7 @@ sub msg_html { my ($ctx, $mime, $footer) = @_; my $hdr = $mime->header_obj; my $tip = _msg_html_prepare($hdr, $ctx); - PublicInbox::WwwStream->new($ctx, sub { + PublicInbox::WwwStream->response($ctx, 200, sub { my ($nr, undef) = @_; if ($nr == 1) { $tip . multipart_text_as_html($mime, '') . @@ -278,7 +278,7 @@ sub stream_thread ($$) { $mime = Email::MIME->new($mime); $ctx->{-title_html} = ascii_html($mime->header('Subject')); $ctx->{-html_tip} = thread_index_entry($ctx, $level, $mime); - my $body = PublicInbox::WwwStream->new($ctx, sub { + PublicInbox::WwwStream->response($ctx, 200, sub { return unless $ctx; while (@q) { $level = shift @q; @@ -297,7 +297,6 @@ sub stream_thread ($$) { $ctx = undef; $ret; }); - [ 200, ['Content-Type', 'text/html; charset=UTF-8'], $body ]; } sub thread_html { @@ -339,7 +338,7 @@ sub thread_html { $ctx->{-title_html} = ascii_html($mime->header('Subject')); $ctx->{-html_tip} = '<pre>'.index_entry($mime, $ctx, scalar @$msgs); $mime = undef; - my $body = PublicInbox::WwwStream->new($ctx, sub { + PublicInbox::WwwStream->response($ctx, 200, sub { return unless $msgs; while ($mime = shift @$msgs) { $mid = mid_clean(mid_mime($mime)); @@ -352,7 +351,6 @@ sub thread_html { $msgs = undef; '</pre>'.$skel; }); - [ 200, ['Content-Type', 'text/html; charset=UTF-8'], $body ]; } sub multipart_text_as_html { diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm index cbd3142d..c4509bd9 100644 --- a/lib/PublicInbox/WWW.pm +++ b/lib/PublicInbox/WWW.pm @@ -236,8 +236,7 @@ sub get_mid_html { require Email::MIME; my $mime = Email::MIME->new($x); searcher($ctx); - [ 200, [ 'Content-Type' => 'text/html; charset=UTF-8' ], - PublicInbox::View::msg_html($ctx, $mime, $foot) ]; + PublicInbox::View::msg_html($ctx, $mime, $foot); } # /$INBOX/$MESSAGE_ID/t/ diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm index d2bf318b..6de1b310 100644 --- a/lib/PublicInbox/WwwStream.pm +++ b/lib/PublicInbox/WwwStream.pm @@ -14,6 +14,12 @@ sub new { bless { nr => 0, cb => $cb, ctx => $ctx }, $class; } +sub response { + my ($class, $ctx, $code, $cb) = @_; + [ $code, [ 'Content-Type', 'text/html; charset=UTF-8' ], + $class->new($ctx, $cb) ] +} + sub _html_top ($) { my ($self) = @_; my $ctx = $self->{ctx}; |