From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id GFnIJTUzIWKCWQEAgWs5BA (envelope-from ) for ; Thu, 03 Mar 2022 22:29:25 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id IE6rIjUzIWLGkgAAauVa8A (envelope-from ) for ; Thu, 03 Mar 2022 22:29:25 +0100 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 15F9B209EF for ; Thu, 3 Mar 2022 22:29:25 +0100 (CET) Received: from localhost ([::1]:58940 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nPt0l-0008VP-VW for larch@yhetil.org; Thu, 03 Mar 2022 16:29:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35380) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPsnv-0005ey-5l for guix-patches@gnu.org; Thu, 03 Mar 2022 16:16:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50053) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nPsnq-0007Ii-Mk for guix-patches@gnu.org; Thu, 03 Mar 2022 16:16:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nPsnq-0002HI-HB for guix-patches@gnu.org; Thu, 03 Mar 2022 16:16:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54241] [PATCH 1/4] http-client: Add response headers to '&http-get-error'. References: <20220303211326.19884-1-ludo@gnu.org> In-Reply-To: <20220303211326.19884-1-ludo@gnu.org> Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Mar 2022 21:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54241 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54241@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 54241-submit@debbugs.gnu.org id=B54241.16463421258666 (code B ref 54241); Thu, 03 Mar 2022 21:16:02 +0000 Received: (at 54241) by debbugs.gnu.org; 3 Mar 2022 21:15:25 +0000 Received: from localhost ([127.0.0.1]:43939 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPsnE-0002Fd-TF for submit@debbugs.gnu.org; Thu, 03 Mar 2022 16:15:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57758) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPsnC-0002FM-RT for 54241@debbugs.gnu.org; Thu, 03 Mar 2022 16:15:24 -0500 Received: from [2001:470:142:3::e] (port=58918 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPsn7-00078m-LD; Thu, 03 Mar 2022 16:15:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=KbRkngTko0T7lcr8FWw0zRyzmJMdgMzzPqVooLXmPlE=; b=YDFscPTLrHTpBE 9GNIhs2cpaE0s2coo40j0IlBRQtLyFSPtFl0kuihbGYOYp55Ra03VuGpNSKN2zqgv195D+7qBTdCr Jsb5PffUBKHPthZ8fj2eyBIGCUgh/D/Ag9LloCqGk2WtSfmaHzuZPb603sZ9Fey8dq7rN3pZ0B+D9 JXiva/E4vFJX+J5/+6YF54+WFgwG2Cj99xh2nZu2k94zabYwDhNYHAoHVJPdgARGgbDIz/pFWuzBs XD5nnP9VTREpUiHbWGwS8/6fYrTD6EKqYfkcSp8nYPAUAwCFWR1lQCtAW3bOk2YzLZeN5/QeKsXFQ lv3bI2DWFq0g7o/LZhzg==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:50082 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nPsmu-0006KA-Tf; Thu, 03 Mar 2022 16:15:16 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Thu, 3 Mar 2022 22:14:41 +0100 Message-Id: <20220303211444.19928-1-ludo@gnu.org> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1646342965; 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:dkim-signature; bh=KbRkngTko0T7lcr8FWw0zRyzmJMdgMzzPqVooLXmPlE=; b=uUn6ZZOEA7ZT7JfEBCssDyDzXUBSp4Gqyd/YuTsdeXzI4z85MqUxieQLsjVTWZcOesXSNT R6/UqAiRHvlQHU31JzqqPjGVEs9B99FgWg791VRZgKc1tjDxbicapY+cvCTg7CAfuJfM23 u2V3FKn5yAwv2OtENACDOZ8+g5mK2rHBl2skTraLWaKSkFvsZYf9zGzlcV+37w5q7M0EIq 6wssHyM6kft8jG9zotxFz3guAYjhKnyLchEUmUCBre7aU09+Z5sa6Xq/rZcwnvYWvHp03q 6vX/a4oWLBjwJQAd2onm2nzOI9vDdwTYnLZX5DQDOBnsqLrC+AHuE4SdxbDNVw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1646342965; a=rsa-sha256; cv=none; b=q+bxDw+iISRV8xOsWB1UlJthxXV2O2emLR9ZFcdig9G/UKWT1jDrn/mYRXMxhmu0zjAw8a meqdQn7eeJUZN4ERs5ytKFGpFIuBdm/G+tGHAnqd58x9FtSgiAQS8umPl3lTkkjo2udwhT Ax0ZKS/w8FiaLI7DgmB/aqRETrPdnHW3EKBVphBYg2TFj23PhYL1lsvyWHC9kTaC2qoIH0 ozetvp55Uw7LS4p6CgtSaJeH0I1pKDnflwKV1KbqNH/VHFDM42oOz4Jvuqh5USbQa5CZsq vjudmfR8Wx/iTO9PzTJjJWQHm6+8cAPkTIUnxOben5KBLIQxRICBfgCTlRUq9Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=YDFscPTL; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -3.16 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=YDFscPTL; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 15F9B209EF X-Spam-Score: -3.16 X-Migadu-Scanner: scn0.migadu.com X-TUID: 55q5iz5BXqsb * guix/http-client.scm (&http-get-error)[headers]: New field. (http-fetch): Initialize the 'headers' field. --- guix/http-client.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/guix/http-client.scm b/guix/http-client.scm index 10bc278023..4b01e31165 100644 --- a/guix/http-client.scm +++ b/guix/http-client.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2020, 2021 Ludovic Courtès +;;; Copyright © 2012-2018, 2020-2022 Ludovic Courtès ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2012, 2015 Free Software Foundation, Inc. ;;; Copyright © 2017 Tobias Geerinckx-Rice @@ -52,6 +52,7 @@ (define-module (guix http-client) http-get-error-uri http-get-error-code http-get-error-reason + http-get-error-headers http-fetch http-multiple-get @@ -69,9 +70,10 @@ (define-module (guix http-client) ;; HTTP GET error. (define-condition-type &http-get-error &error http-get-error? - (uri http-get-error-uri) ; URI - (code http-get-error-code) ; integer - (reason http-get-error-reason)) ; string + (uri http-get-error-uri) ;URI + (code http-get-error-code) ;integer + (reason http-get-error-reason) ;string + (headers http-get-error-headers)) ;alist (define* (http-fetch uri #:key port (text? #f) (buffered? #t) @@ -138,7 +140,8 @@ (define* (http-fetch uri #:key port (text? #f) (buffered? #t) (raise (condition (&http-get-error (uri uri) (code code) - (reason (response-reason-phrase resp))) + (reason (response-reason-phrase resp)) + (headers (response-headers resp))) (&message (message (format -- 2.34.0