From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] http: additional info for write failures
Date: Thu, 7 Jul 2016 20:12:12 +0000 [thread overview]
Message-ID: <20160707201212.32316-1-e@80x24.org> (raw)
There was a spurious test failure in t/httpd-corner.t
which I have not been able to reproduce.
---
lib/PublicInbox/HTTP.pm | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/lib/PublicInbox/HTTP.pm b/lib/PublicInbox/HTTP.pm
index abf648f..17f8930 100644
--- a/lib/PublicInbox/HTTP.pm
+++ b/lib/PublicInbox/HTTP.pm
@@ -98,7 +98,7 @@ sub rbuf_process {
$self->{rbuf} = substr($self->{rbuf}, $r);
my $len = input_prepare($self, \%env);
- defined $len or return write_err($self); # EMFILE/ENFILE
+ defined $len or return write_err($self, undef); # EMFILE/ENFILE
$len ? event_read_input($self) : app_dispatch($self);
}
@@ -118,7 +118,7 @@ sub event_read_input ($) {
while ($len > 0) {
if ($$rbuf ne '') {
my $w = write_in_full($input, $rbuf, $len);
- return write_err($self) unless $w;
+ return write_err($self, $len) unless $w;
$len -= $w;
die "BUG: $len < 0 (w=$w)" if $len < 0;
if ($len == 0) { # next request may be pipelined
@@ -332,9 +332,10 @@ sub input_prepare {
sub env_chunked { ($_[0]->{HTTP_TRANSFER_ENCODING} || '') =~ /\bchunked\b/i }
sub write_err {
- my ($self) = @_;
+ my ($self, $len) = @_;
my $err = $self->{httpd}->{env}->{'psgi.errors'};
my $msg = $! || '(zero write)';
+ $msg .= " ($len bytes remaining)\n" if defined $len;
$err->print("error buffering to input: $msg\n");
quit($self, 500);
}
@@ -410,7 +411,7 @@ sub event_read_input_chunked { # unlikely...
until ($len <= 0) {
if ($$rbuf ne '') {
my $w = write_in_full($input, $rbuf, $len);
- return write_err($self) unless $w;
+ return write_err($self, "$len chunk") if !$w;
$len -= $w;
if ($len == 0) {
# we may have leftover data to parse
--
EW
next reply other threads:[~2016-07-07 20:12 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-07 20:12 Eric Wong [this message]
2016-07-08 18:20 ` [PATCH 2/1] http: drop extra newline in error message 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=20160707201212.32316-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).