* [PATCH] ds: fix return values of do_read and *_tls_step
@ 2019-06-30 5:15 Eric Wong
0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2019-06-30 5:15 UTC (permalink / raw)
To: meta
We need to ensure all these subroutines return false on
incomplete.
---
lib/PublicInbox/DS.pm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm
index a8236023..eacdf5cb 100644
--- a/lib/PublicInbox/DS.pm
+++ b/lib/PublicInbox/DS.pm
@@ -449,6 +449,7 @@ sub do_read ($$$;$) {
if ($! == EAGAIN) {
epwait($sock, epbit($sock, EPOLLIN) | EPOLLONESHOT);
rbuf_idle($self, $rbuf);
+ 0;
} else {
$self->close;
}
@@ -568,7 +569,6 @@ sub epwait ($$) {
my ($sock, $ev) = @_;
epoll_ctl($Epoll, EPOLL_CTL_MOD, fileno($sock), $ev) and
confess("EPOLL_CTL_MOD $!");
- 0;
}
# return true if complete, false if incomplete (or failure)
@@ -579,8 +579,10 @@ sub accept_tls_step ($) {
return $self->close if $! != EAGAIN;
epwait($sock, PublicInbox::TLS::epollbit() | EPOLLONESHOT);
unshift @{$self->{wbuf} ||= []}, \&accept_tls_step;
+ 0;
}
+# return true if complete, false if incomplete (or failure)
sub shutdn_tls_step ($) {
my ($self) = @_;
my $sock = $self->{sock} or return;
@@ -588,6 +590,7 @@ sub shutdn_tls_step ($) {
return $self->close if $! != EAGAIN;
epwait($sock, PublicInbox::TLS::epollbit() | EPOLLONESHOT);
unshift @{$self->{wbuf} ||= []}, \&shutdn_tls_step;
+ 0;
}
# don't bother with shutdown($sock, 2), we don't fork+exec w/o CLOEXEC
--
EW
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2019-06-30 5:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-30 5:15 [PATCH] ds: fix return values of do_read and *_tls_step Eric Wong
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).