From patchwork Tue May 2 09:22:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Storm, Christian" X-Patchwork-Id: 1775762 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::13e; helo=mail-lf1-x13e.google.com; envelope-from=swupdate+bncbdd6bwv65qpbbofmyoramgqecrmcrqq@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=V/YbazHL; dkim-atps=neutral Received: from mail-lf1-x13e.google.com (mail-lf1-x13e.google.com [IPv6:2a00:1450:4864:20::13e]) (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 4Q9ZNG0kDkz1ymp for ; Tue, 2 May 2023 19:22:04 +1000 (AEST) Received: by mail-lf1-x13e.google.com with SMTP id 2adb3069b0e04-4edc7406cb5sf2251870e87.3 for ; Tue, 02 May 2023 02:22:04 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1683019321; cv=pass; d=google.com; s=arc-20160816; b=iehYTUixZ7QDfXjFpZpwemm/3wTgRBUYHpCfa+B96l7shImSKSFtriJrYPE3qFKiEg uUd20LNgmjopGX93DNva9F5qWNgsNcuJ7STpUPxNtUj42x6SXtaN4cuqjFMeTL68ylqE PYTwZWUlGfDc+l0ZGymwbGyl0ywhTaf8as2CufBBJ16N1yAsOBfQUH9UO+koRTEJ6MKz TT+2BTngXoyIzxXUe6xz5IyvbYoJqpwsmucEzDiuOquJKuOCm9NXMJECMdx4H+wZXlvg 370iPxDzMRNT/LO28a2kFNIIDw00+bv9zjLub3NTtD89Kd5rruSLhn5ggLwyetieScAN 9Jdg== 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:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=eA8qQ7TFDlqSxwbEEvBl7qsy26e9a2jLK+8Qe6GQyYI=; b=ka+JcQsfaP+SbpLQ1CyLbemjC3OSChU5rJDbXtlEPPYmDzthwlbHJjS2j/cuXLHSwH /tIp2HJeK+Ig+dhMaX9HP/F3hLBkHGl3uVWAzgd1PnQyPST6w/DFsYBFLchCg6E2WDMo GJTcufENAs8bYHhJzB7fGfFIoR/AIs9DRAYsjuYaV3Rq/q65VEMjI3NfvKHwB+b2UlR8 BU9sBKKCl2BRwOpor4yFoX9SlHACamU+AkuJ5wpmc1rs1hNNdh1OD1wjr0vpnk6yuNeP O/ACS3fix+vAE8AYsoLY4lDVnKj69bgqne0oLxfgcGetDOeCbIYJR4K3l/nFT03WZ4GH V/JA== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="paGd/fVc"; 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:7e1b::624 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=1683019321; x=1685611321; 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 :references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=eA8qQ7TFDlqSxwbEEvBl7qsy26e9a2jLK+8Qe6GQyYI=; b=V/YbazHLdNg5U1jrTBZxKEf1q9Zwm9bO25KELvUUMBrA3ZzdqJyg2It7o88ViENHxP 1ht94UHLA98z1r7zL2lNtoUwa5zcyl2UVGOvkJSzfRUSjs2V2p/6g3y6o8VziU45MJUT MALv8J0J4La/how3tI68mUesy9E6bMaGEjmSfTxo8fYCd0mb4IZ0dQ2+9FkaooAB6bbj pS9/P6h6wPZ5XQM49pcO8jHzD/GMscuiDzBU0hEHlyfOli8Wm+nwugmC8s3M7nuykjU7 wCOKZHG9v5ZkzqkwDG9jAoyjAfpvLXU2umM1vnbcCOXpSM1KhMd86jusf18Pd5/QwJCk nNeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683019321; x=1685611321; 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 :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=eA8qQ7TFDlqSxwbEEvBl7qsy26e9a2jLK+8Qe6GQyYI=; b=IlDIkXEvXEU4AbgGrDnluZ6VVLHtrUJ9D9s5cvEkdhL6vZUYHjaSfStH+LkjiPUJEp c4c+1NKiNEDMQgXLkk8Wk4uatQJJpIowaxGuBG43STI+86PgfmDG5f9ONNHssXsrIk45 RfDPIDAPPNa6yIuW4D5+grPHktZzeqezqWNLWp/cdxw23lWTKamSuCHcEbGgtwlU2TDs mMSx659R4aKIFUIhbNDpQ3shRuPow++yX8sftoAe6TC3HBcTWt4LacZNCa1izGNf3eh/ dNSX0NnP3pvKwNcP4fSOvePvmM0f6XSOiORydJLVLYFb+Nh5jhmFZbLXhGkixjiTEJAA hPlQ== X-Gm-Message-State: AC+VfDyBKcvQxOtsaWlsGzLrRZ5wXtzTnhkWR8l4BGXOQAwqkjuV2tTL T4ihl2UqSvEHgZ87cO4d/RQ= X-Google-Smtp-Source: ACHHUZ7fwQVF8dxl7cKtYRXn3WhUrZWKVTpcFflb6AOotm+ht8YV4Qnq/U8PGbbOQoXhyylAmB2Zlg== X-Received: by 2002:ac2:5491:0:b0:4ea:e799:59f8 with SMTP id t17-20020ac25491000000b004eae79959f8mr3719681lfk.2.1683019321453; Tue, 02 May 2023 02:22:01 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a2e:a5c3:0:b0:2a7:b0f2:717a with SMTP id n3-20020a2ea5c3000000b002a7b0f2717als2558919ljp.5.-pod-prod-gmail; Tue, 02 May 2023 02:21:59 -0700 (PDT) X-Received: by 2002:a2e:98d7:0:b0:2a8:d1cd:a10 with SMTP id s23-20020a2e98d7000000b002a8d1cd0a10mr4680922ljj.4.1683019319874; Tue, 02 May 2023 02:21:59 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1683019319; cv=pass; d=google.com; s=arc-20160816; b=0oF6pzkY3JJWJUgGGYLP3cDMENY1Gs0iqJMQ5xS1WrWJhqo3B++JT7zwWYahdxmeO9 cCpwhk7EB0Or8CeTXUwheeXcEBmzwUBaRX9CQENp1+/+eSZRTeC/qgqbDi6e74vCU4yX 4jnUiwJuXHrlbJExSk8b2kKsVJK3bkwZSAt7aOd5FWiT21nsoZbBvkD/O9Q8HEaquUnB MvExfRBTJH3OrzKAYGkI/cy0uWw1Lyt+ZjMzGwwUAC5LGbMUdXF3Y4RjLObNUfn48k8J Ten2PPN0oLWiMPAPIxhC0+Vop0Oo9NsFIvd65XUBX/swDUXKlXlWpwGwzKk9jpzZbeWL PzZA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=sT0ZOO7ZH81fNSBlPGkniW05EAUXR7aVkZeI8FG8kM0=; b=nDxgOdNnlomITTbBvYOEkSdrncmuxjsSBJvNtmw9fKrzWjD8q0hSixL+ZNMIezENjw +FDEjwXx0phMCpyYPAZn5R3zBTbgz7T3uC8hK01iqNUT5gKfxtPPBFJhzT90Dx8xHuJu I1PDn7k9iQcfEKQpgWoDvsV7VI+i1/dsfTQUxPbntGXKGCUXv3n8JpgXs/hhnl1da9IZ ULIQ0FhjZtlepkS5P9xh+97R6clHD4WWs3y9Oj0EYBAdZN9ucWuKhM3DcGNAeGO8rMtC F3pRdjBESLeF1/5PXguK6qw8scWxF6Zh+D41ZvzbEPFeUO5sMeAb/JSvr8/OciXfxbVU u9NA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="paGd/fVc"; 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:7e1b::624 as permitted sender) smtp.mailfrom=christian.storm@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on20624.outbound.protection.outlook.com. [2a01:111:f400:7e1b::624]) by gmr-mx.google.com with ESMTPS id y12-20020a05651c154c00b002a79f4b8367si570569ljp.2.2023.05.02.02.21.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 May 2023 02:21:59 -0700 (PDT) Received-SPF: pass (google.com: domain of christian.storm@siemens.com designates 2a01:111:f400:7e1b::624 as permitted sender) client-ip=2a01:111:f400:7e1b::624; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TQrMtZddEgse7o1dmmQDYp7Jo1c4T9mW9KaN/7Yqwkq6VN3qEBbhGDvLZ1jOB5WO7yPEQTxnqyuSjLmhL2iUR7cFwdaxr69lEJK9OlRnbLcG+MjXWt28ryjKYWVjT+4MJGj9x5ZAnIrWr/EoQ9EsFzfMOGJy7DuLb+hpKx/gNmCDF5JFMN6urzp48i6eteR0Z9kv5T01d3VrjdvSRyr/ZlIGqOa7W/44AB4MAyo3WH5KXUTI9iZhavYir4Dd8/7U4ceus6Vil3xCdBBHIKKeEbxjBDMsmL0CfFsJkq5Uigj2WvYJSOcKp1WyxW6mRHS3Mt0S7z4iCUhHKJ1K7JDESA== 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=sT0ZOO7ZH81fNSBlPGkniW05EAUXR7aVkZeI8FG8kM0=; b=mS7ulQsWw8nt4Uq/ACJZE5EaCqd1R1lG7YoOrcdveydiYP2NZSDPVe2nMUg6SwE6lm/+0+ei8PU81o+2Z0c76oxCUDKunxO8+nZ5dTNy84UmUEMmjFQYEsD5KdAR1L1MtcqWeGubeSgyLlLmnVTk7qKe5wFE5w4OX0Uk5NR1bV36YfUNEZAtC+Rw4I3k7UOzCthf1trCnu9e86ac7swk3maNJLZrLFlaw9SMbvH0m11oxpad+qYebuC+keeMhaRXEM98Au0Y22ouBZ+wUpAq0JFkis9yjW9TLQmHO6Hpcxc3h1Fu1jMrNdLdGDnhDPZJmpRcxuj9b49TzetCCXAugQ== 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 AS1PR10MB5413.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:4af::21) by AM7PR10MB3525.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:140::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6340.26; Tue, 2 May 2023 09:21:58 +0000 Received: from AS1PR10MB5413.EURPRD10.PROD.OUTLOOK.COM ([fe80::9c03:22c5:8e26:b8]) by AS1PR10MB5413.EURPRD10.PROD.OUTLOOK.COM ([fe80::9c03:22c5:8e26:b8%6]) with mapi id 15.20.6340.031; Tue, 2 May 2023 09:21:58 +0000 X-Patchwork-Original-From: "'Christian Storm' via swupdate" From: "Storm, Christian" To: swupdate@googlegroups.com Cc: Christian Storm Subject: [swupdate] [PATCH V2] channel_curl: Set charset in Content-Type Header Date: Tue, 2 May 2023 11:22:42 +0200 Message-Id: <20230502092242.63439-1-christian.storm@siemens.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230428193802.38596-1-christian.storm@siemens.com> References: <20230428193802.38596-1-christian.storm@siemens.com> X-ClientProxiedBy: CH2PR19CA0008.namprd19.prod.outlook.com (2603:10b6:610:4d::18) To AS1PR10MB5413.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:4af::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS1PR10MB5413:EE_|AM7PR10MB3525:EE_ X-MS-Office365-Filtering-Correlation-Id: f58b0585-7f80-4238-354b-08db4aeead91 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sTihdpnfLeghzRn1AL+Wf+OOP94wdyj04j8cQsypLsn7INHRCCd4s08Zn8GRfTPs5PVHGjKH3nZrMT7qAYifGpgZFjqppZO6EEchFqL+nmyO2zcz9IU071CMeX44zaRpKWUvARZsWD/QFGZyMRkNvO3aFEKiRbb+l8RaSmxIk+zSBryyXWvmhcnhbw9P6Xy0XiiPfujseconmTGIIqYNqM6yAySfoMhs0cDa4u1gsrm6ALRWX25nDJ5JaM1IXu/TMxAsGKLV3PNtJYyKiINoaqWBQlJLPwBVXlcJGltSvAVkIlQweVgpDTkuKuKMuUGXqWZuNahIlJvVaaOtTgpQNjcvz2hs1afvST4syD5hzO8V02L2KSMV6hWxlczvmC2UvG9314eHkefse/X66zD8/UZ1uPCMTBPc0YcORfY9i/KDxaTAUoWZvdWL8k9MhVQmRD+HwalFSOqXizn4uPKtTI+J2hnknL4QbChenlDU7TWCvlVg/Ran+BbM8GDkvrnaB3TBxUklV5gnP/fCF0UP3w1wtXLu8h3AMMsIiM8FVr0RjC2F7NVq1kFmIn7/Nfo4 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS1PR10MB5413.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230028)(4636009)(136003)(39860400002)(376002)(366004)(396003)(346002)(451199021)(6486002)(186003)(83380400001)(478600001)(6666004)(2616005)(6512007)(6506007)(1076003)(26005)(107886003)(36756003)(2906002)(5660300002)(38100700002)(82960400001)(66476007)(66556008)(4326008)(41300700001)(66946007)(6916009)(8936002)(8676002)(44832011)(86362001)(316002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /svW28vxWnlQMBpdG3ZjNuNxtVX8qILAaQNwGH6MogAFTbu3LGU+BiJblhXVn1+VHZDsauei8RQLlxbj/Vvir7TA/A08Y3WWJO5sQYRAt0Cj3PZoIcs6JESli7splWe4YPuU4dogVhPItpAO9W8Rk8oeDESd032HuUbTUBTmGpuc+9ZfC7UOO28rLtZ/w4nkt2GxHQ9GRk2ESqEH1xXFJlinaHM4sEJH1G8UztQB5J2IJDoxbfm4Ap1H2sT0gUbT6VC5sfhErA2jJn6UXtHKhj6MPcsznT9Z/+l/6fhW46TL1JYN9ellzgnFTtn/YmDOrvF8mT0g3Mzxle3jSdVLhRKhlztZA8Gff8q+v8Vsk+XM15VytSyul9bjd6wh5sfmiDgQMTaeF/U+BBuVEPxz7UCPq0OO0DPn5K93Yl//YUAA8h4d+i4DW69Ks5ONbrHx4tThTywN3/XOgVTjxofSx39YZ+I4D3W45QwsUy/N9auSj714BPb5fyTvuduN8nfcieMprtGGJPyxF+Nkd+p4E1KRsCq2Zed2BqUUJ3anpbUxj4O5yseFHDHKhbcVpHjXBXfC724tJOa3hajQYzY4hbUzL/H1mdiqPkHNF4hBkvlvJsKLmFiPB91O9GN+3UPYiIe/yeNr0mbuS7B6/ynjCX3JXbZH4vHoETPPgoqgK8uaJ3a7aRVhetnHuGsKeBpMBewWO9mkQaXP9wgN3BnUibBVHnlPDwgVFBEMxXGG5Azk+zy5RZlunddNDy83ixDYW0dp4Sa1/qle25L0Oc7svllUvFG033c3HpG8uCl563t9Ys33x6PwCmli4ZxNLeLPi6uKsIAZVuz2zbIKyDvW5KAAvssuDjyyna52soIEReGWzhwt1jk4pPdoJcT6D0vKieXnMQn300+Ca/Wfe/kwQbnXdKRL25MsrbdLJpe9ZNmMRuT/Vb0uZsC6nWCPvpjbViIpqsxk5RnITemAYw9CM4PiXTL5yDvohs4OL1EIHxPagHUatNg8FfWKO0RJPZN1m974bfT5M96k1tpk/wfa2NfRJcgVu8absynkk3cSzva2JewxmWeFgDWkh8oah5LZSIwAXkP1v6o1Ym+DlDnyW/wqEKOOkDDJM+B0gyt4rOPdqzx5Cv2rcE/d6tvRRHK67UGEZra8rIIfc9hTXhjZnF4ZB20ViC0MTciC95hsK5euvr1Gdyi/R415+xa1akbeY5Vb834lPf28lzgUpEUwKdk14RUiCzzbYplpJR/eNYpvU8unrbfc6g9liyIFY7DLzjhXFQSU9b7adGojfmcCvMEs+nrXXZU//BHywoKjRON0IVATuxVUPf71adVu69PhwtJXWgsSl0U6sBMEOqB2Hsox6+AUXRSq2h0oBMI7EQ4F4hhvSNfswvRCSpvLz+3bsVcIJYc5aSB6rjDlNChkLEOECqu4Wi1nbk2c1flfjCOr9y09lp2Wopjf2ccxxMmaxC/KUmb2p1zLRY0XINENQT+qIyZVqfKdylKyKBFjg8qGksEjiAFE+fja+sJDN7yF4SfjFr7nkhWoTHRWc5HFQxCIor/cv8rWYC5+SCeugzvyJ1enZ3n0BBCnCa1cDqXKGUO1tTCgoDCcjuERS3xYew== X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: f58b0585-7f80-4238-354b-08db4aeead91 X-MS-Exchange-CrossTenant-AuthSource: AS1PR10MB5413.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 May 2023 09:21:58.1132 (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: H6pLUlf9F0TLSpZbb7ZQEoKeSlPySVYv8wTUd0s9eL5/8IzMIPkr1DphuOeuAhbugHvJv78wabQ1C6kfKkviKqoAlDL1KWW6235GoFtMYYc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR10MB3525 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="paGd/fVc"; 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:7e1b::624 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: , Replace 'charsets: utf-8' HTTP Header by 'Content-Type:' Header's 'charset=' parameter: As per RFC 4627, the default encoding for application/json is UTF-8. RFC 8259 demands that JSON text exchanged between non-closed systems must be UTF-8 encoded. It continues to state that no 'charset' parameter is defined for application/json. Hence, while adding one has no effect on compliant recipients according to RFC 8259, do not add a non-defined parameter. This also fixes adding the Header 'charsets: utf-8' twice for application/json and application/text content if no memory allocation error occurs. Signed-off-by: Christian Storm --- Rebased to current HEAD, didn't apply cleanly there. Changed "Set channel header Accept failed." to "Setting channel header Accept failed." for symmetry. corelib/channel_curl.c | 47 ++++++++++++++---------------------------- 1 file changed, 16 insertions(+), 31 deletions(-) diff --git a/corelib/channel_curl.c b/corelib/channel_curl.c index f12ff7be..2bd23571 100644 --- a/corelib/channel_curl.c +++ b/corelib/channel_curl.c @@ -521,41 +521,26 @@ static channel_op_res_t channel_set_content_type(channel_t *this, else content = "application/json"; - if (ENOMEM_ASPRINTF == - asprintf(&contenttype, "Content-Type: %s", - content)) { - result = CHANNEL_EINIT; + if (ENOMEM_ASPRINTF == asprintf(&contenttype, "Content-Type: %s%s", content, + !strcmp(content, "application/text") ? "; charset=utf-8" : "")) { ERROR("OOM when setting Content-type."); - } - - if (ENOMEM_ASPRINTF == - asprintf(&accept, "Accept: %s", - content)) { - result = CHANNEL_EINIT; - ERROR("OOM when setting Accept."); - } - - if (result == CHANNEL_OK) { - if (((channel_curl->header = curl_slist_append( - channel_curl->header, contenttype)) == - NULL) || - ((channel_curl->header = curl_slist_append( - channel_curl->header, accept)) == NULL) || - ((channel_curl->header = curl_slist_append( - channel_curl->header, "charsets: utf-8")) == NULL)) { - ERROR("Set channel header failed."); result = CHANNEL_EINIT; + } else { + if ((channel_curl->header = curl_slist_append(channel_curl->header, + contenttype)) == NULL) { + ERROR("Setting channel header Content-type failed."); + result = CHANNEL_EINIT; } } - /* - * Add default charset for application content - */ - if ((!strcmp(content, "application/json") || !strcmp(content, "application/text")) && - (result == CHANNEL_OK)) { - if ((channel_curl->header = curl_slist_append( - channel_curl->header, "charsets: utf-8")) == NULL) { - ERROR("Set channel charset header failed."); - result = CHANNEL_EINIT; + + if (ENOMEM_ASPRINTF == asprintf(&accept, "Accept: %s", content)) { + ERROR("OOM when setting Accept."); + result = CHANNEL_EINIT; + } else { + if ((channel_curl->header = curl_slist_append(channel_curl->header, + accept)) == NULL) { + ERROR("Setting channel header Accept failed."); + result = CHANNEL_EINIT; } }