From: Eric Wong <e@yhbt.net>
To: meta@public-inbox.org
Subject: [PATCH 04/11] extmsg: use WwwResponse::oneshot
Date: Sat, 21 Mar 2020 02:03:47 +0000 [thread overview]
Message-ID: <20200321020354.9056-5-e@yhbt.net> (raw)
In-Reply-To: <20200321020354.9056-1-e@yhbt.net>
No reason to use the ->getline interface for small responses.
---
lib/PublicInbox/ExtMsg.pm | 4 ++--
lib/PublicInbox/WwwStream.pm | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/lib/PublicInbox/ExtMsg.pm b/lib/PublicInbox/ExtMsg.pm
index 44884ad2..74a95cf9 100644
--- a/lib/PublicInbox/ExtMsg.pm
+++ b/lib/PublicInbox/ExtMsg.pm
@@ -158,7 +158,7 @@ sub ext_msg {
$ctx->{-html_tip} = $s .= '</pre>';
$ctx->{-title_html} = $title;
$ctx->{-upfx} = '../';
- PublicInbox::WwwStream->response($ctx, $code);
+ PublicInbox::WwwStream::oneshot($ctx, $code);
}
sub ext_urls {
@@ -196,7 +196,7 @@ sub exact {
qq(<a\nhref="$u$href/">$u$html/</a>\n)
} @$found),
$ext_urls, '</pre>');
- PublicInbox::WwwStream->response($ctx, $code);
+ PublicInbox::WwwStream::oneshot($ctx, $code);
}
1;
diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm
index 2dd8b157..fceef745 100644
--- a/lib/PublicInbox/WwwStream.pm
+++ b/lib/PublicInbox/WwwStream.pm
@@ -28,7 +28,7 @@ sub new {
bless {
nr => 0,
- cb => $cb || \&close,
+ cb => $cb,
ctx => $ctx,
base_url => base_url($ctx),
}, $class;
@@ -175,8 +175,9 @@ sub oneshot {
ctx => $ctx,
base_url => base_url($ctx),
}, __PACKAGE__;
- [ $code, [ 'Content-Type', 'text/html; charset=UTF-8' ],
- [ _html_top($self), $$strref, _html_end($self) ] ]
+ [ $code, [ 'Content-Type', 'text/html; charset=UTF-8' ], [
+ _html_top($self), $strref ? $$strref : (), _html_end($self)
+ ] ]
}
1;
next prev parent reply other threads:[~2020-03-21 2:03 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-21 2:03 [PATCH 00/11] www: export SQLite altid dumps Eric Wong
2020-03-21 2:03 ` [PATCH 01/11] qspawn: reinstate filter support, add gzip filter Eric Wong
2020-03-21 2:03 ` [PATCH 02/11] gzipfilter: lazy allocate the deflate context Eric Wong
2020-03-21 2:03 ` [PATCH 03/11] wwwstream: introduce oneshot API to avoid ->getline Eric Wong
2020-03-21 2:03 ` Eric Wong [this message]
2020-03-21 2:03 ` [PATCH 05/11] wwwstream: oneshot sets content-length Eric Wong
2020-03-21 2:03 ` [PATCH 06/11] mbox: need_gzip uses WwwStream::oneshot Eric Wong
2020-03-21 2:03 ` [PATCH 07/11] qspawn: handle ENOENT (and other errors on exec) Eric Wong
2020-03-21 2:03 ` [PATCH 08/11] search: clobber -user_pfx on query parser initialization Eric Wong
2020-03-21 2:03 ` [PATCH 09/11] wwwtext: show thread endpoint w/ indexlevel=basic Eric Wong
2020-03-21 2:03 ` [PATCH 10/11] altid: warn about non-word prefixes Eric Wong
2020-03-21 2:03 ` [PATCH 11/11] www: add endpoint to retrieve altid dumps Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200321020354.9056-5-e@yhbt.net \
--to=e@yhbt.net \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).