From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 1/4] httpd: avoid crash on cgit -> coderepo 404 fallback
Date: Fri, 23 Dec 2022 11:05:12 +0000 [thread overview]
Message-ID: <20221223110515.19907-2-e@80x24.org> (raw)
In-Reply-To: <20221223110515.19907-1-e@80x24.org>
A trickled cgit response can cause HTTPD::Async->event_step to
fire an extra time after header parsing. We need to account for
the lack of async_pass call populating ->{fh} and ->{http} in
that case and avoid calling $self->{fh}->write when there's
no {fh}.
---
lib/PublicInbox/GitHTTPBackend.pm | 6 ++++--
lib/PublicInbox/HTTPD/Async.pm | 3 ++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/lib/PublicInbox/GitHTTPBackend.pm b/lib/PublicInbox/GitHTTPBackend.pm
index 1eb51f27..974a1831 100644
--- a/lib/PublicInbox/GitHTTPBackend.pm
+++ b/lib/PublicInbox/GitHTTPBackend.pm
@@ -128,7 +128,7 @@ sub input_prepare {
{ 0 => $in };
}
-sub parse_cgi_headers {
+sub parse_cgi_headers { # {parse_hdr} for Qspawn
my ($r, $bref, $ctx) = @_;
return r(500) unless defined $r && $r >= 0;
$$bref =~ s/\A(.*?)\r?\n\r?\n//s or return $r == 0 ? r(500) : undef;
@@ -145,7 +145,9 @@ sub parse_cgi_headers {
}
# fallback to WwwCoderepo if cgit 404s. Duplicating $ctx prevents
- # ->finalize from the current Qspawn from using qspawn.wcb
+ # ->finalize from the current Qspawn from using qspawn.wcb.
+ # This makes qspawn skip ->async_pass and causes
+ # PublicInbox::HTTPD::Async::event_step to close shortly after
if ($code == 404 && $ctx->{www} && !$ctx->{_coderepo_tried}++) {
my %ctx = %$ctx;
$ctx{env} = +{ %{$ctx->{env}} };
diff --git a/lib/PublicInbox/HTTPD/Async.pm b/lib/PublicInbox/HTTPD/Async.pm
index cb76cfab..9e592f47 100644
--- a/lib/PublicInbox/HTTPD/Async.pm
+++ b/lib/PublicInbox/HTTPD/Async.pm
@@ -48,7 +48,8 @@ sub event_step {
# this may call async_pass when headers are done
$cb->(my $refcnt_guard = delete $self->{arg});
} elsif (my $sock = $self->{sock}) {
- my $http = $self->{http};
+ # $http may be undef if discarding body output from cgit on 404
+ my $http = $self->{http} or return $self->close;
# $self->{sock} is a read pipe for git-http-backend or cgit
# and 65536 is the default Linux pipe size
my $r = sysread($sock, my $buf, 65536);
next prev parent reply other threads:[~2022-12-23 11:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-23 11:05 [PATCH 0/4] httpd/async fixes for coderepos Eric Wong
2022-12-23 11:05 ` Eric Wong [this message]
2022-12-23 11:05 ` [PATCH 2/4] httpd/async: remove useless undef Eric Wong
2022-12-23 11:05 ` [PATCH 3/4] qspawn: shorten life of {hdr_buf} in generic code path Eric Wong
2022-12-23 11:05 ` [PATCH 4/4] httpd/async + qspawn: rename {fh} fields 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=20221223110515.19907-2-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.
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).