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 D64031F480 for ; Fri, 6 Jan 2023 10:11:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1672999861; bh=pQdEYfdIuUDUO7G/lYnzWWfd4L1BrGaVhMlRhW5Wf74=; h=From:To:Subject:Date:In-Reply-To:References:From; b=VxWfxC1RJWCj3SvDYKF1y/x6QOcH+Zzb1iKBGYhSDUdvJ/FGYOpVielWnBDW60EJb TRv6lzP90H8jHf95XDdY5rdZalUkHmx43/MZO7MI9hMquGetLdsRoGjDQKFylIvDcz Y241/RPG87tJ6+4R9Tt3yqjt/l6Kg6byRa3wUbyM= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 4/4] qspawn: fix EINTR with generic PSGI servers Date: Fri, 6 Jan 2023 10:10:53 +0000 Message-Id: <20230106101053.1461700-5-e@80x24.org> In-Reply-To: <20230106101053.1461700-1-e@80x24.org> References: <20230106101053.1461700-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Using the `next' operator doesn't work with `do {} (until|while)' loops, so change it to use `until {}'. I've never encountered this problem in-the-wild, but I only use -(netd|httpd). --- lib/PublicInbox/Qspawn.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/PublicInbox/Qspawn.pm b/lib/PublicInbox/Qspawn.pm index 5d3ec309..f2beb4b2 100644 --- a/lib/PublicInbox/Qspawn.pm +++ b/lib/PublicInbox/Qspawn.pm @@ -201,7 +201,7 @@ sub rd_hdr ($) { my $total_rd = 0; my $hdr_buf = $self->{hdr_buf}; my ($ph_cb, $ph_arg) = @{$self->{parse_hdr}}; - do { + until (defined($ret)) { my $r = sysread($self->{rpipe}, $$hdr_buf, 4096, length($$hdr_buf)); if (defined($r)) { @@ -225,7 +225,7 @@ EOM warn "error reading header: $!"; $ret = [ 500, [], [ "Internal error\n" ] ]; } - } until (defined $ret); + } delete $self->{parse_hdr}; # done parsing headers $ret; }