From patchwork Wed May 17 08:46:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Storm, Christian" X-Patchwork-Id: 1782523 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::23e; helo=mail-lj1-x23e.google.com; envelope-from=swupdate+bncbdd6bwv65qpbbw5iskrqmgqeih2cisq@googlegroups.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20221208 header.b=PcpW+EQu; dkim-atps=neutral Received: from mail-lj1-x23e.google.com (mail-lj1-x23e.google.com [IPv6:2a00:1450:4864:20::23e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QLmtD5PxJz20dg for ; Wed, 17 May 2023 18:46:27 +1000 (AEST) Received: by mail-lj1-x23e.google.com with SMTP id 38308e7fff4ca-2adaf72737esf1857211fa.0 for ; Wed, 17 May 2023 01:46:26 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1684313181; cv=pass; d=google.com; s=arc-20160816; b=CAjslWIfI2og49lYHsTE8P796rRRGZoBRQJ+0ip2lu48Qba6Bw6SGis44N7yyKhSGC Y8MMhkaprKiMipxIloPF7igOehAeWgKrewJC6O2UMXvrN6pyx1gjVxO/W1EToqCSCtFJ tb0fG6ehzumSLCSVrIy6IX8tLTzv815BVHAq/EWLYnP6XlTgmYWcKfl5409lLu9KSTwH 2pWH2hSRbnP73TNQseFpZTqdSLVtkQ0m3fpjt91+ZBwoOLGb/tLQDwpbGwcMnNYjY0WP TWN6UKQ9YfswoGQhQITHhIa2H3YSCL/qoPcdxMH+JwrsVTb9qXNyXo4E9r3dWGpIdRdW KtZQ== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:mime-version:message-id :date:subject:cc:to:from:dkim-signature; bh=+b1SFb+KU+YPKYbtk+fV0QDMTZF/gqQJj2ZpeumIRik=; b=o05NJzy+J+8Cp7jIyGiu2OYwrpgTu3tYtCpxlA+ld+4HKIemwrXpgevUfOnpMM9lKp Axg4MCLx2MBxrlYBJlB0Ix19KX0Lb7lNaC5lQbFMvC/SThWbaiKdmOH8LiJmao9qnACy oL70qS/wpjPVHBVY7MFZGX8i5Q8QkFQMp6a0/a5Vzx+t54yrbCQ1xJujI7nW/ktJIqrY cAuJ/BPnTeadM493SjoSz26xBGHZ0JzuJO4/feyoV65yLU6caLPCyVrdESTKO1axCmcI BViNJfT0AMWbq8uYY5FEH86bRtivMj+NNxgG2YmE4upfpQauEniTn+a4YYMswGS9oZyc UWQQ== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="dfs/aCTK"; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of christian.storm@siemens.com designates 2a01:111:f400:7d00::62d as permitted sender) smtp.mailfrom=christian.storm@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20221208; t=1684313181; x=1686905181; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+b1SFb+KU+YPKYbtk+fV0QDMTZF/gqQJj2ZpeumIRik=; b=PcpW+EQuZK5oPBUbXqFMTo+ElGaswbSwIuArF4lSwNyB1PiJkNMe9YIngOU7KEzq5O GD5CZG8BspTQN6RJp+t6/lWmTcotI5Bej2jdlR/KndXA5MLCw5ZgWrr/M63wL0B7Ufv/ SJBiZlwpgSt4ytjyM7kV4fbF2ICeveo2/SwCkMr6NnKb/PDePkbGHqzvzF0vUk/6yXZy vBQnoOc/Zu6wEaLPcEY2CLnuszPuF98eKGEb5K7m4n0//NpyxYF4GTK6h2rzz1fL0aJf rUv+8IqzpTqjvxigdDB8sR9ku6b63SFerzz0mCI9w3MymznI4JRYQFiqKfouPXH1oE4N XEiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684313181; x=1686905181; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=+b1SFb+KU+YPKYbtk+fV0QDMTZF/gqQJj2ZpeumIRik=; b=bpacghLN4c+0vDd+QoLyaX2KYhNzpW23FLw1jAqdiE3N6NZPxxexDti+2k92rQFtBp 14/9fahzbCW/iiu64u6SwheEAgoOMqDfC6rqXBazeiJIaFXb0Tcj2sTUfpBfPvJ6GEi6 Jc2cINtktWN2ZX+CGaAZmY7NlQIf6gvsFCbxOB7g3bgt1knV0u358Hen+Jx0jAUYsZqT 7qjTgmUED9lJo0jdsFxsnwDP/t9LtJAOPt84962kLfo0+MlMJeGa772jGxLT2Dax5UHy PEda6+PjazKSKUdib9Fb8MqQBFecOrTNBizlnJuNU7b5RONcQF5qRy3DUAXPKoebgNXg ZSbg== X-Gm-Message-State: AC+VfDxXalaUlEbbDBcyw614ql5gu6km0p/VzBz48gARaKQf2UwQ0lCa XyqGe1J9PFtqKEPkk339rf8= X-Google-Smtp-Source: ACHHUZ4LlRA4IU292Pk8MdxgMp/DaXRfMn3dIfMKbmL6B5z09JOTW3OQqXw0RGhcI+LqQPj0NaMdBQ== X-Received: by 2002:a2e:780d:0:b0:2ad:814c:6adc with SMTP id t13-20020a2e780d000000b002ad814c6adcmr7087919ljc.4.1684313180558; Wed, 17 May 2023 01:46:20 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:6512:310c:b0:4f1:3be1:1d7 with SMTP id n12-20020a056512310c00b004f13be101d7ls507690lfb.1.-pod-prod-02-eu; Wed, 17 May 2023 01:46:18 -0700 (PDT) X-Received: by 2002:ac2:41cf:0:b0:4f1:4812:e130 with SMTP id d15-20020ac241cf000000b004f14812e130mr7328745lfi.39.1684313178820; Wed, 17 May 2023 01:46:18 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1684313178; cv=pass; d=google.com; s=arc-20160816; b=NIuEjR7BRhFP0bWmjowa6RGGo7ieRhMKWZJ3i6PxnDtNMDaZYxoqfc3fop9GnDJ6Cn CJQZejAQ9GMXu4TRu6bYuVDhkL4vzicCDXUPWRopyt5qXyfwMaKefGVrPDIEbQQltyv/ QFyeNot33cpljtIaMxOdMdyjM9KZyAtoPXZR03ANmFNpQNlZe5MDG5PXiwhFbOl9l35i 0SVHybgW06PBSNjluR/VhsWKHpbX+KLCX3A8iPqkCVkPkIXmhYuIuHZlwiqPZSJCy8F9 XoB8YXiLuPk9ZeEnOj84lcsUY3564LqtpRN/g5NDsZxQfIb4EyJBESemWD4nv0SBfLb+ gdWg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:message-id:date:subject:cc :to:from:dkim-signature; bh=f2hd5nGDlf/C+ei61t/K66ZrFrKE0+JEdGwa1/1S23U=; b=er1M7ur6LHMytTT7pXMWoRySPOUXIS/BFf+LIftmMeHPeQGXBwMrgPA+VyVYcXqWxX ni/SsJDQHlfUxQ3zLP/JFbGcHs1HhBZbJQk+DSCCL+ZCtfa1B1ZEEasFZSrabElUFoml iLCuCW42FQCCdFK9RHblLG2J+wVKXyui8mWpmGucQ+6O6+89/T6j7sEqD0i3LgssgLeW wPEqf4anp7NSb6vqXiuth5Y5i9ArCZpayejpy8w0yca/BQ5hm/aJdfSEy5je9XD/mM1x UVO6BUOq542uDUkpyLZiT8szZNM1KdfvdCUmFSRdasrQYjVu1PLE2oEkXdvv+fhJ4hLz tCng== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="dfs/aCTK"; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of christian.storm@siemens.com designates 2a01:111:f400:7d00::62d as permitted sender) smtp.mailfrom=christian.storm@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2062d.outbound.protection.outlook.com. [2a01:111:f400:7d00::62d]) by gmr-mx.google.com with ESMTPS id o12-20020ac24bcc000000b004edc2bbd25bsi1502643lfq.3.2023.05.17.01.46.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 May 2023 01:46:18 -0700 (PDT) Received-SPF: pass (google.com: domain of christian.storm@siemens.com designates 2a01:111:f400:7d00::62d as permitted sender) client-ip=2a01:111:f400:7d00::62d; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Jx4K4do4JbxU2UCCPMXn+opEyBuFOqMcxf8sMOQcHJExnT8nxVn0DkfhV/T+rI4jqU9cE/iNbY/eNzqzE+8X2Y8gnGGatxx7NiZ4noiMW7bMEtfM2zIjRyEkcgq43jcKxmwtDYhJuKTY6qPZZ6T8wA5aMPxOgw6FPL0662tf6E95gx4bAshruBu2jjfAOJs0io8xwaSonwJzhyEqC9ikPyHBGLuwJrOSrKYKF/WyhNmmKnS/rur8aH/6MkHynfvelHXMmwrl680wkKbV0GTRQEENQ4PAv86VJF41Hfhe8eYWLDNjmVE2yLeJaP67b6Dv4C7Oc+gVKIoFkEW7nOvkHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=f2hd5nGDlf/C+ei61t/K66ZrFrKE0+JEdGwa1/1S23U=; b=FnueB4Vk/pakS16RmSYUe/GcvfOu2S6PyRoOSQygWCjzEFZiDDz3wRyiYhgiqXaeJtgWkGxgf+bjRMFaW0ruV6/oW+NTVC8Lka0A3KeQD3oSylA1bUTZX/9xPa6dEgOAn2TGD5G0Esw5ru3GiHYhlYeTk6FIhEDzaoXJROkLgiwUG4n/dCvndxRLDloirqj+epQGehxHBBKjGx/JvZpVaV6R5suJnOXFl4iau+77jHXHfPRBaaBf/XPmMOSIcWvUuPqtkq+F8OOvBqnDFQsCOpVTEvEUMCcUK8iJD3vEdjZ8TSQEjP/ntnY3P5gko9OnAkPk+0v9vtqWX5D7U41JFA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none Received: from DB9PR10MB5404.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:333::17) by AS1PR10MB5238.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:4a4::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.33; Wed, 17 May 2023 08:46:17 +0000 Received: from DB9PR10MB5404.EURPRD10.PROD.OUTLOOK.COM ([fe80::6bed:3b93:4756:c9f3]) by DB9PR10MB5404.EURPRD10.PROD.OUTLOOK.COM ([fe80::6bed:3b93:4756:c9f3%5]) with mapi id 15.20.6387.032; Wed, 17 May 2023 08:46:17 +0000 X-Patchwork-Original-From: "'Christian Storm' via swupdate" From: "Storm, Christian" To: swupdate@googlegroups.com Cc: Christian Storm Subject: [swupdate] [PATCH] channel_curl: Optionally return body on PUT Date: Wed, 17 May 2023 10:46:26 +0200 Message-Id: <20230517084626.104774-1-christian.storm@siemens.com> X-Mailer: git-send-email 2.40.1 X-ClientProxiedBy: FR0P281CA0121.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:97::19) To DB9PR10MB5404.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:333::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9PR10MB5404:EE_|AS1PR10MB5238:EE_ X-MS-Office365-Filtering-Correlation-Id: 378a6be8-3eb0-4f67-a673-08db56b32da5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: C7JaWOlps+Sz/A9+FrvT8F5hqzPVvAfiu4QEAQKnE3yi8WP7tzZI131Tj4B6hhZIpvQQ6CjW7P2i6LPQ9NfxWQnEwyYhwFpf+UXx5E0YX76wGKlYoJtyj2vM4cbgN6RTRLKNO8i+dTC7DLYAwyu/doxIW655gCYwgcIYRKfTEVQjiysnxqYLxDIzWiPYyX9SS187XUka1JQNExm+bVmBdKqB5kvQNFWXR7eCvxsF6lqUTuEDcXEi/SRfI215vUzKDSiCnQQysiORmo9EYNCfh6Al1RUdWXzW2k8OVelvHwY7Nk1KG4xp7llSOceomKVVNPBiV3ZbyPD1maE1EOq/PAKA9LVBFCRTB13jRVj2uJqMhZdUz/m9WoGUNN8pl9+2HmqcK7iWeDRwlBp8Ck1UV5n2SaEglZKlEY+c4NSx0bmx0S7E/FVq0iXdJgzm1PqQ4pAza1jvM+EIpKzMXi1MHbdV/8keoP0yJqFQtVPY5NMRgbS2zRqu6wzss91M46WY43UqL0ElOdWotPc6E2jQCzuPsv++kYtVewYsn8bgr9Y7dUah7tgR2hrTqyQzVAB+ X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB9PR10MB5404.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230028)(4636009)(39860400002)(366004)(376002)(346002)(136003)(396003)(451199021)(86362001)(36756003)(6486002)(478600001)(316002)(6916009)(66476007)(4326008)(66556008)(66946007)(41300700001)(8676002)(8936002)(2906002)(5660300002)(6666004)(44832011)(38100700002)(82960400001)(2616005)(6512007)(1076003)(186003)(107886003)(83380400001)(6506007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kdxWnTK/MNnDG9QIfYJ7FbOGMretYV6Xef7Nlr99Iz74r1n+HTbbZgnYgCMxmbgyT7jz1Lg5zemfEaUfHjRtpVepwxf1lIiiEkgo7tBA9O30BsyWEB/YRzlYCoPp3dtb3LYPvBjKpkjseXpXFTbYqjzg2dkrC6khqtYwnOuuyaxFFMnGbglTU6tZ31qb9t8JP+Jio/VOGNzK9Pk/8lrRGGEC/OJvhU9GAvZCEkJbsDelhEFX0TXBpNDTMyV+GgdR8i1ZV6LieBA+Tn3DXgImC5EPXpuLNbsjpybl+GaIA2APR/YXSE/rwHBW03GkH7Jc3p/NjMIhII/tuzQI4yqwLh10X+qrs8tPqqp5XyuQ7YYP8Xm2l9IL5oB5onLzfb3s4qFRA2gm/fGMM5S+mA75QaCA5qJEvkl4EeQiVWh79YOvP3QOk6JE7Y/UIussqjqf7q9wkFW2fGge+qtIf5l2Ac8RNfhNvJ3WjrfvNl0lfbij7oJnGzbZWMXnHLj+AEahhVlEXAHzVnM8EcsjHOcd6VfZ+tZCGIp81RZTZUlTXtElTRhH3YzYgEHF7eRThemDs+cHJt2IBKg/pbBGYe9yWHIq1goo8gMnTr07MXkyH8DbitjSWZy7hIwFJjfOHW6n8OA/TMROVPglYw4bQNO/z7BTsHq3RQcCqwjMe3rOE7sDFB8WLVGDbzVQQ+rWmhC9wd/sGyhNzlkknxQazr3XKH9gUn8jX34OH8Ud1BzIbypfg+N1g1OOTBaFKUoN9YEt2+LXvxd+/B5XuD1++V7bebkY54br+CA/XPcUnodUw1DXaf7p7EFnAWoSoy3kA7GomfriCs00wdnXS04g29v+i25PAkSJxZ876fxA3KXu4oHoz/YAS4eH8hEnwArTblZsxCwUkt35C6xCRc/CLNvczlMVZOaFo4FaPijZEwTM76bE+0Z1Jl+i89cou3nVNA7lsdxLKmRzbqMWXFjtP8HrIS4WaQcDwNhUVXpgsbHDA9T5Ec2DO57HmqLPyKCbr+FMRkTctBpx1Dn1OhydVKcUYSkWNhkI7YtuWR35C5kSeuszBQyrIQp0fRFpx5dllLLBsHlHrK9CACCv9kRfs9T6aeK2gnvFNpUfL+stNyUfq+CBpmEqxiPjGULAMdbCvtJM9fCdSjydkNTJkf0Bwd3vU+4XdL7tBELBiG0XOGezzzp5AC16bBM/Z61+9jXGWScnz7aIaWFjKulC857zsJCCqG0v1Ia4p37iDvM+u3nQSDTUnz33HkpIxmiqjfGNbxgMI1ARtYly5xvVMOwKPGDf9hKR5amTnIW+w7T1s+iqFtHs7fCiTVjFK+PrDsqdZJu2eYExmB9DlljYstJnb/gvFSa6AELACEbmclaUoppQZkU8/9lsYzgLe8A/huHysr8eTKIDPjFsx9oVYy1CVxXPByD+AWP5+fCG7E4lXbm1HJbpPn45loGHkuAvswr+SLfzm10f6cGNFjcv7BGFyz5TwkDewVc96FqAZMS74SIeHd4pAK+DKWQCYWthLnxqoCWj5woSZyYhegjJ/y23awDswL7uTktP77lMAVV7BKVhB+BtKx7VcrJaKIYRmF0VTVeUC/+twZX+tXjzE7OaPYkbfs7XpYBYNyATmFKh2I/F3ZaS3EDhdynkPrLLBvEEpp3UUSxusO1kKfckR5x6K/MCrA== X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 378a6be8-3eb0-4f67-a673-08db56b32da5 X-MS-Exchange-CrossTenant-AuthSource: DB9PR10MB5404.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2023 08:46:16.9482 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: yto1ulffT7UbpVunM8rz4eRqj0NZ6WXu0QN/eM1yMJAHTEs4Mlq+Kh6LnTmy5a2rMN4K11n8+ZS/h21DEcFYh5QyuJLn7AjMygUkYJgQoM8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS1PR10MB5238 X-Original-Sender: christian.storm@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="dfs/aCTK"; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of christian.storm@siemens.com designates 2a01:111:f400:7d00::62d as permitted sender) smtp.mailfrom=christian.storm@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Christian Storm Reply-To: Christian Storm Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , PUT may return the sent document applied. This is currently not returned to channel_curl consumers. Signed-off-by: Christian Storm --- corelib/channel_curl.c | 10 ++++-- suricatta/server_general.c | 3 ++ suricatta/server_hawkbit.c | 1 + suricatta/server_lua.c | 70 ++++++++++++++++++-------------------- 4 files changed, 45 insertions(+), 39 deletions(-) diff --git a/corelib/channel_curl.c b/corelib/channel_curl.c index 1207304e..24a259e3 100644 --- a/corelib/channel_curl.c +++ b/corelib/channel_curl.c @@ -342,6 +342,8 @@ channel_op_res_t channel_map_http_code(channel_t *this, long *http_response_code case 429: /* Bad Request, i.e., too many requests. Try again later. */ return CHANNEL_EAGAIN; case 200: + case 201: + case 204: case 206: case 226: return CHANNEL_OK; @@ -1103,7 +1105,7 @@ static channel_op_res_t channel_put_method(channel_t *this, void *data) CURLcode curlrc = curl_easy_perform(channel_curl->handle); if (curlrc != CURLE_OK) { - ERROR("Channel put operation failed (%d): '%s'", curlrc, + ERROR("Channel PUT operation failed (%d): '%s'", curlrc, curl_easy_strerror(curlrc)); result = channel_map_curl_error(curlrc); goto cleanup_header; @@ -1116,7 +1118,11 @@ static channel_op_res_t channel_put_method(channel_t *this, void *data) if (channel_data->nocheckanswer) goto cleanup_header; - channel_log_reply(result, channel_data, NULL); + channel_log_reply(result, channel_data, &outdata); + + if (result == CHANNEL_OK) { + result = parse_reply(channel_data, &outdata); + } cleanup_header: outdata.memory != NULL ? free(outdata.memory) : (void)0; diff --git a/suricatta/server_general.c b/suricatta/server_general.c index 1c8e777e..6f4bce8b 100644 --- a/suricatta/server_general.c +++ b/suricatta/server_general.c @@ -324,6 +324,9 @@ static void *server_progress_thread (void *data) if (logbuffer) { channel_data.request_body = logbuffer; channel_data.method = CHANNEL_PUT; + /* .format is already specified in channel_data_defaults, + * but being explicit doesn't hurt. */ + channel_data.format = CHANNEL_PARSE_NONE; channel_data.content_type = "application/text"; result = map_channel_retcode(channel->put(channel, (void *)&channel_data)); if (result != SERVER_OK) diff --git a/suricatta/server_hawkbit.c b/suricatta/server_hawkbit.c index 726ef191..a400c12c 100644 --- a/suricatta/server_hawkbit.c +++ b/suricatta/server_hawkbit.c @@ -1590,6 +1590,7 @@ static server_op_res_t server_send_target_data(void) } channel_data_reply.url = url; + channel_data_reply.format = CHANNEL_PARSE_NONE; channel_data_reply.request_body = json_reply_string; TRACE("URL=%s JSON=%s", channel_data_reply.url, channel_data_reply.request_body); channel_data_reply.method = CHANNEL_PUT; diff --git a/suricatta/server_lua.c b/suricatta/server_lua.c index 579ddc70..bdf34084 100644 --- a/suricatta/server_lua.c +++ b/suricatta/server_lua.c @@ -717,49 +717,45 @@ static int channel_do_operation(lua_State *L, channel_method_t op) push_result(L, result); lua_pushnumber(L, result); lua_newtable(L); - if (op == CHANNEL_GET || channel_data.method == CHANNEL_POST || - channel_data.method == CHANNEL_PATCH) { - push_to_table(L, "http_response_code", channel_data.http_response_code); - push_to_table(L, "format", channel_data.format); - #ifdef CONFIG_JSON - if (channel_data.format == CHANNEL_PARSE_JSON) { - lua_pushstring(L, "json_reply"); - if (!channel_data.json_reply || - !json_to_table(L, channel_data.json_reply)) { - lua_pushnil(L); - } - lua_settable(L, -3); - - if (channel_data.json_reply && - json_object_put(channel_data.json_reply) != 1) { - ERROR("JSON object should be freed but was not."); - } - } - #endif - if (channel_data.format == CHANNEL_PARSE_RAW) { - lua_pushstring(L, "raw_reply"); - if (!channel_data.raw_reply) { - lua_pushnil(L); - } else { - lua_pushstring(L, channel_data.raw_reply); - free(channel_data.raw_reply); - } - lua_settable(L, -3); + push_to_table(L, "http_response_code", channel_data.http_response_code); + push_to_table(L, "format", channel_data.format); + #ifdef CONFIG_JSON + if (channel_data.format == CHANNEL_PARSE_JSON) { + lua_pushstring(L, "json_reply"); + if (!channel_data.json_reply || + !json_to_table(L, channel_data.json_reply)) { + lua_pushnil(L); } + lua_settable(L, -3); - lua_pushstring(L, "received_headers"); - lua_newtable(L); - if (!LIST_EMPTY(channel_data.received_headers)) { - struct dict_entry *entry; - LIST_FOREACH(entry, channel_data.received_headers, next) { - lua_pushstring(L, dict_entry_get_key(entry)); - lua_pushstring(L, dict_entry_get_value(entry)); - lua_settable(L, -3); - } + if (channel_data.json_reply && + json_object_put(channel_data.json_reply) != 1) { + ERROR("JSON object should be freed but was not."); + } + } + #endif + if (channel_data.format == CHANNEL_PARSE_RAW) { + lua_pushstring(L, "raw_reply"); + if (!channel_data.raw_reply) { + lua_pushnil(L); + } else { + lua_pushstring(L, channel_data.raw_reply); + free(channel_data.raw_reply); } lua_settable(L, -3); } + lua_pushstring(L, "received_headers"); + lua_newtable(L); + if (!LIST_EMPTY(channel_data.received_headers)) { + struct dict_entry *entry; + LIST_FOREACH(entry, channel_data.received_headers, next) { + lua_pushstring(L, dict_entry_get_key(entry)); + lua_pushstring(L, dict_entry_get_value(entry)); + lua_settable(L, -3); + } + } + lua_settable(L, -3); dict_drop_db(&header_send); dict_drop_db(&header_receive);