From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] http: move empty string check into write callback
Date: Tue, 3 May 2016 02:52:23 +0000 [thread overview]
Message-ID: <20160503025223.15330-1-e@80x24.org> (raw)
This empty string check is for middlewares such as Deflater
which may write empty strings, not for direct real callers of
Danga::Socket who (presumably) know what they're doing.
---
lib/PublicInbox/HTTP.pm | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/lib/PublicInbox/HTTP.pm b/lib/PublicInbox/HTTP.pm
index 3286e79..bbcb089 100644
--- a/lib/PublicInbox/HTTP.pm
+++ b/lib/PublicInbox/HTTP.pm
@@ -189,7 +189,9 @@ sub response_header_write {
sub response_write {
my ($self, $env, $res) = @_;
my $alive = response_header_write($self, $env, $res);
- my $write = sub { $self->write($_[0]) };
+
+ # middlewares such as Deflater may write empty strings
+ my $write = sub { $self->write($_[0]) if $_[0] ne '' };
my $close = sub {
if ($alive) {
$self->event_write; # watch for readability if done
@@ -390,13 +392,6 @@ sub close {
$self->SUPER::close(@_);
}
-sub write ($$) : method {
- my PublicInbox::HTTP $self = $_[0];
- return 1 if (defined($_[1]) && ref($_[1]) eq '' && $_[1] eq '');
-
- $self->SUPER::write($_[1]);
-}
-
# for graceful shutdown in PublicInbox::Daemon:
sub busy () {
my ($self) = @_;
--
EW
reply other threads:[~2016-05-03 2:52 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20160503025223.15330-1-e@80x24.org \
--to=e@80x24.org \
--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.
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).