From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id o1OKE9dTW2ACbgAA0tVLHw (envelope-from ) for ; Wed, 24 Mar 2021 14:59:35 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id iIb7DtdTW2A8IgAA1q6Kng (envelope-from ) for ; Wed, 24 Mar 2021 14:59:35 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id AE83226744 for ; Wed, 24 Mar 2021 15:59:34 +0100 (CET) Received: from localhost ([::1]:46768 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lP4yr-0000bH-HY for larch@yhetil.org; Wed, 24 Mar 2021 10:59:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lP4wQ-00054U-64 for guix-patches@gnu.org; Wed, 24 Mar 2021 10:57:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52477) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lP4wP-0005El-SX for guix-patches@gnu.org; Wed, 24 Mar 2021 10:57:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lP4wP-0001eX-Pl for guix-patches@gnu.org; Wed, 24 Mar 2021 10:57:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47288] [PATCH] guix: http-client: Tweak http-multiple-get error handling. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 24 Mar 2021 14:57:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47288 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Christopher Baines Cc: 47288@debbugs.gnu.org Received: via spool by 47288-submit@debbugs.gnu.org id=B47288.16165977656285 (code B ref 47288); Wed, 24 Mar 2021 14:57:01 +0000 Received: (at 47288) by debbugs.gnu.org; 24 Mar 2021 14:56:05 +0000 Received: from localhost ([127.0.0.1]:35790 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lP4vU-0001dH-Vs for submit@debbugs.gnu.org; Wed, 24 Mar 2021 10:56:05 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37060) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lP4vT-0001cg-7A for 47288@debbugs.gnu.org; Wed, 24 Mar 2021 10:56:03 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:57203) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lP4vM-0004ax-FK; Wed, 24 Mar 2021 10:55:58 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=57330 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1lP4vJ-0002NE-3b; Wed, 24 Mar 2021 10:55:54 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: <20210321005600.12551-1-mail@cbaines.net> (Christopher Baines's message of "Sun, 21 Mar 2021 00:56:00 +0000") References: <20210321004338.31867-1-mail@cbaines.net> <20210321005600.12551-1-mail@cbaines.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) Date: Wed, 24 Mar 2021 15:55:51 +0100 Message-ID: <87o8f8eh3c.fsf_-_@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1616597974; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=4ZlbIwKgOe3gmit4WXUBC//ER57dotuHCgFsR8ZG+wI=; b=HD+DU70yHES8DM4SvbFlbR02uBnGmvcRlvx0lBiIgT0yPyc1u6SXU1njP4OO/Cxw4FvpTn znHfmD7Ua94NAZCvlj5lMD2WM7ZXURaTZcTd60JI9a3e6zaU68hIn9GAw8tEvZHAJMxkKt +LYXiIVI/MClP2r4ngUBvEJkQ1/QtaNjlMnt99jQp/aFXQcqmGBOYKWdrSYWIvgqgt9QkX m9Ezx9KUcu9I90z5dyajWqA/iyvyriGGfiL4+CTIKloSvgBlNWMpohLjsO+3stqJCUdWHF E7iR9Zco1j+6efozPSpySqLwgo/YUAo0K/xuzPUiqWq6cL1jMqOUXfbqi/6C8Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1616597974; a=rsa-sha256; cv=none; b=AVMO3gEFbKhPkyUNM69/1V/OfS4RjTPdXEn25OUVEgr2DdESSHADG/B2SP9vRST6D049Kd O6xZ7P/WnGeyIq+4zZTjvRRKIBJwMvnab+DfOzZ748lbKOTQ049uTIJIRNdTky4M6rEWhb fDfmTOIDqBciPBm3tTcChzDEOuoub+ph7v0puMgnVwLmY3ZhnU9EnolfydEufjPLeK50yU k1AFc+XXas10ousctyA7co3fDNMu4RdcuzAUUmzH2QlxiIEZvJdAWjBYWsniUt/XXCQTm3 V03utW+iLu1zWZfZ21hizGVD6EBwQpfK0C57W2X1cOOKmJJc0GpELIZD7JHKGQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -2.92 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: AE83226744 X-Spam-Score: -2.92 X-Migadu-Scanner: scn0.migadu.com X-TUID: su+3rSAMRxpq As discussed at , I=E2=80=99m still unsu= re these exceptions need to be caught within =E2=80=98http-multiple-get=E2=80= =99 and at each iteration. Just minor comments: Christopher Baines skribis: > + (catch #t > + (lambda () > + (let* ((resp (read-response p)) > + (body (response-body-port resp)) > + (result (proc head resp body result))) > + ;; The server can choose to stop responding at any = time, > + ;; in which case we have to try again. Check wheth= er > + ;; that is the case. Note that even upon "Connecti= on: > + ;; close", we can read from BODY. > + (match (assq 'connection (response-headers resp)) > + (('connection 'close) > + (close-port p) > + (list 'connect > + #f > (drop requests (+ 1 processed)) > result)) > - (apply throw key args)))))))))) > + (_ > + (list 'loop tail (+ 1 processed) result))))) > + (lambda (key . args) > + ;; If PORT was cached and the server closed the conne= ction > + ;; in the meantime, we get EPIPE. In that case, open= a > + ;; fresh connection and retry. We might also get > + ;; 'bad-response or a similar exception from (web res= ponse) > + ;; later on, once we've sent the request, or a > + ;; ERROR/INVALID-SESSION from GnuTLS. > + (if (or (and (eq? key 'system-error) > + (=3D EPIPE (system-error-errno `(,key ,@= args)))) > + (and (eq? key 'gnutls-error) > + (eq? (first args) error/invalid-session)= )1 > + (memq key > + '(bad-response > + bad-header > + bad-header-component))) > + (begin > + (close-port p) > + (list 'connect > + #f > + requests > + result)) > + (apply throw key args)))) > + (('connect . args) > + (apply connect args)) > + (('loop . args) > + (apply loop args))))))))) This is not new to this patch, but I think the whole exception handling bit should be factorized and written in such a way that =E2=80=98http-multiple-get=E2=80=99 still fits on a horizontal screen (even= though mine is actually vertical :-)). Otherwise one might easily overlook the core logic of the function. Ludo=E2=80=99.