From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 0079D1F47C for ; Mon, 2 Jan 2023 08:20:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1672647613; bh=yjDM5zqFAs/USti9t1J6oqIRsesvcTMydI6luacl4+Q=; h=From:To:Subject:Date:From; b=HWJwfJHnIg9gzV2so4RB1xC3Qsc6VrervSnCKznDND3Ivb6mAdbjGK/fwolgChoFh i7NcL/wizgwY9k6rOY6NjoDXPMyAnVW8mZd+J9jyKLpQzfJ6nivxls3rQ1nrOA+ygk a7U0YFs+39InnxnOormzwWDsWFzS8jEhnPiN5850= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] qspawn: fix process finalization for generic PSGI server Date: Mon, 2 Jan 2023 08:20:13 +0000 Message-Id: <20230102082013.1946879-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: This fixes the inability to fallback to WwwCoderepo on cgit 404s with generic PSGI servers. Unfortunately, this doesn't seem to get tested with generic PSGI tests, and doesn't happen on public-inbox-httpd, obviously. --- lib/PublicInbox/Qspawn.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/PublicInbox/Qspawn.pm b/lib/PublicInbox/Qspawn.pm index 9ca6b3db..297a284f 100644 --- a/lib/PublicInbox/Qspawn.pm +++ b/lib/PublicInbox/Qspawn.pm @@ -233,9 +233,10 @@ sub psgi_return_init_cb { if (ref($r) ne 'ARRAY' || scalar(@$r) == 3) { # error if ($async) { # calls rpipe->close && ->event_step $async->close; # PublicInbox::HTTPD::Async::close - } else { - $self->{rpipe}->close; + } else { # generic PSGI: + delete($self->{rpipe})->close; event_step($self); + waitpid_err($self); } if (ref($r) eq 'ARRAY') { # error $wcb->($r)